--- //depot/vendor/freebsd/src/sys/kern/kern_conf.c	2005/10/01 19:25:25
+++ //depot/projects/smpng/sys/kern/kern_conf.c	2005/10/03 17:13:14
@@ -57,8 +57,7 @@
 void
 dev_lock(void)
 {
-	if (!mtx_initialized(&devmtx))
-		mtx_init(&devmtx, "cdev", NULL, MTX_DEF);
+
 	mtx_lock(&devmtx);
 }
 
--- //depot/vendor/freebsd/src/sys/kern/kern_mutex.c	2005/09/02 20:25:20
+++ //depot/projects/smpng/sys/kern/kern_mutex.c	2005/10/18 15:08:37
@@ -67,6 +72,8 @@
 
 #include <ddb/ddb.h>
 
+#include <fs/devfs/devfs_int.h>
+
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
@@ -900,5 +937,6 @@
 	mtx_init(&Giant, "Giant", NULL, MTX_DEF | MTX_RECURSE);
 	mtx_init(&sched_lock, "sched lock", NULL, MTX_SPIN | MTX_RECURSE);
 	mtx_init(&proc0.p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK);
+	mtx_init(&devmtx, "cdev", NULL, MTX_DEF);
 	mtx_lock(&Giant);
 }