Index: kern/kern_mutex.c
===================================================================
RCS file: /usr/home/ncvs/src/sys/kern/kern_mutex.c,v
retrieving revision 1.196
diff -u -r1.196 kern_mutex.c
--- kern/kern_mutex.c	9 Jun 2007 18:09:37 -0000	1.196
+++ kern/kern_mutex.c	18 Jul 2007 03:04:01 -0000
@@ -118,7 +118,6 @@
  * System-wide mutexes
  */
 struct mtx blocked_lock;
-struct mtx sched_lock;
 struct mtx Giant;
 
 #ifdef LOCK_PROFILING
@@ -769,7 +774,6 @@
 	 * Initialize mutexes.
 	 */
 	mtx_init(&Giant, "Giant", NULL, MTX_DEF | MTX_RECURSE);
-	mtx_init(&sched_lock, "sched lock", NULL, MTX_SPIN | MTX_RECURSE);
 	mtx_init(&blocked_lock, "blocked lock", NULL, MTX_SPIN);
 	blocked_lock.mtx_lock = 0xdeadc0de;	/* Always blocked. */
 	mtx_init(&proc0.p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK);
Index: sparc64/sparc64/pmap.c
===================================================================
RCS file: /usr/home/ncvs/src/sys/sparc64/sparc64/pmap.c,v
retrieving revision 1.164
diff -u -r1.164 pmap.c
--- sparc64/sparc64/pmap.c	3 Jun 2007 19:39:38 -0000	1.164
+++ sparc64/sparc64/pmap.c	18 Jul 2007 03:04:01 -0000
@@ -108,6 +108,13 @@
 #define	PMAP_SHPGPERPROC	200
 #endif
 
+/* XXX */
+#include "opt_sched.h"
+#ifndef SCHED_4BSD
+#error "sparc64 only works with SCHED_4BSD which uses a global scheduler lock."
+#endif
+extern struct mtx sched_lock;
+
 /*
  * Virtual and physical address of message buffer.
  */
Index: sys/mutex.h
===================================================================
RCS file: /usr/home/ncvs/src/sys/sys/mutex.h,v
retrieving revision 1.97
diff -u -r1.97 mutex.h
--- sys/mutex.h	6 Jun 2007 03:40:47 -0000	1.97
+++ sys/mutex.h	18 Jul 2007 03:04:01 -0000
@@ -355,7 +355,6 @@
 /*
  * Global locks.
  */
-extern struct mtx sched_lock;
 extern struct mtx Giant;
 extern struct mtx blocked_lock;