diff -ur /usr/src/sys/kern/kern_mutex.c src/sys/kern/kern_mutex.c
--- /usr/src/sys/kern/kern_mutex.c	Mon Jul 18 20:43:08 2005
+++ src/sys/kern/kern_mutex.c	Fri Jul 22 22:39:48 2005
@@ -833,7 +833,9 @@
 	else
 		lock->lo_class = &lock_class_mtx_sleep;
 	lock->lo_name = name;
+#ifdef WITNESS
 	lock->lo_type = type != NULL ? type : name;
+#endif
 	if (opts & MTX_QUIET)
 		lock->lo_flags = LO_QUIET;
 	if (opts & MTX_RECURSE)
Only in src/sys/kern: kern_mutex.c.orig
diff -ur /usr/src/sys/kern/kern_sx.c src/sys/kern/kern_sx.c
--- /usr/src/sys/kern/kern_sx.c	Fri Jan  7 00:35:39 2005
+++ src/sys/kern/kern_sx.c	Fri Jul 22 22:40:11 2005
@@ -71,7 +71,9 @@
 	    ("sx lock %s %p already initialized", description, sx));
 	bzero(sx, sizeof(*sx));
 	lock->lo_class = &lock_class_sx;
+#ifdef WITNESS
 	lock->lo_type = lock->lo_name = description;
+#endif
 	lock->lo_flags = LO_WITNESS | LO_RECURSABLE | LO_SLEEPABLE |
 	    LO_UPGRADABLE;
 	sx->sx_lock = mtx_pool_find(mtxpool_lockbuilder, sx);
Only in src/sys/kern: sched_4bsd.c.orig
Only in src/sys/kern: sched_ule.c.orig
Only in src/sys/kern: subr_turnstile.c.orig
diff -ur /usr/src/sys/sys/_lock.h src/sys/sys/_lock.h
--- /usr/src/sys/sys/_lock.h	Sat Jun 19 16:58:35 2004
+++ src/sys/sys/_lock.h	Fri Jul 22 22:39:09 2005
@@ -34,10 +34,12 @@
 struct lock_object {
 	struct	lock_class *lo_class;
 	const	char *lo_name;		/* Individual lock name. */
-	const	char *lo_type;		/* General lock type. */
 	u_int	lo_flags;
+#ifdef WITNESS
+	const	char *lo_type;		/* General lock type. */
 	TAILQ_ENTRY(lock_object) lo_list; /* List of all locks in system. */
 	struct	witness *lo_witness;
+#endif
 };
 
 #endif /* !_SYS__LOCK_H_ */
Only in src/sys/sys: turnstile.h.orig