--- //depot/vendor/freebsd/src/sys/amd64/include/smp.h	2007/05/19 05:15:00
+++ //depot/user/attilio/attilio_smpng/amd64/include/smp.h	2007/08/31 21:28:03
@@ -34,7 +34,6 @@
 extern int			mp_naps;
 extern int			boot_cpu_id;
 extern struct pcb		stoppcbs[];
-extern struct mtx		smp_tlb_mtx;
 extern int			cpu_apic_ids[];
 
 /* IPI handlers */
--- //depot/vendor/freebsd/src/sys/i386/include/smp.h	2007/05/19 05:05:17
+++ //depot/user/attilio/attilio_smpng/i386/include/smp.h	2007/08/31 21:28:03
@@ -35,7 +35,6 @@
 extern int			mp_naps;
 extern int			boot_cpu_id;
 extern struct pcb		stoppcbs[];
-extern struct mtx		smp_tlb_mtx;
 extern int			cpu_apic_ids[];
 #ifdef COUNT_IPIS
 extern u_long *ipi_invltlb_counts[MAXCPU];
--- //depot/vendor/freebsd/src/sys/kern/kern_switch.c	2007/08/20 06:36:50
+++ //depot/user/attilio/attilio_smpng/kern/kern_switch.c	2007/09/10 22:23:04
@@ -586,7 +586,6 @@
 
 /****** functions that are temporarily here ***********/
 #include <vm/uma.h>
-extern struct mtx kse_zombie_lock;
 
 /*
  *  Allocate scheduler specific per-process resources.
--- //depot/vendor/freebsd/src/sys/kern/kern_thread.c	2007/07/27 09:22:31
+++ //depot/user/attilio/attilio_smpng/kern/kern_thread.c	2007/09/10 22:23:04
@@ -70,7 +70,7 @@
 
 #endif
 TAILQ_HEAD(, thread) zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads);
-struct mtx zombie_lock;
+static struct mtx zombie_lock;
 MTX_SYSINIT(zombie_lock, &zombie_lock, "zombie lock", MTX_SPIN);
 
 static void thread_zombie(struct thread *);
--- //depot/vendor/freebsd/src/sys/kern/subr_witness.c	2007/06/16 23:33:01
+++ //depot/user/attilio/attilio_smpng/kern/subr_witness.c	2007/09/10 22:36:12
@@ -406,7 +406,6 @@
 	{ "sio", &lock_class_mtx_spin },
 #ifdef __i386__
 	{ "cy", &lock_class_mtx_spin },
-	{ "descriptor tables", &lock_class_mtx_spin },
 #endif
 #ifdef __sparc64__
 	{ "pcib_mtx", &lock_class_mtx_spin },
@@ -430,22 +429,22 @@
 	{ "entropy harvest mutex", &lock_class_mtx_spin },
 	{ "syscons video lock", &lock_class_mtx_spin },
 	{ "time lock", &lock_class_mtx_spin },
+#ifdef SMP
+	{ "smp rendezvous", &lock_class_mtx_spin },
+#endif
 	/*
 	 * leaf locks
 	 */
-	{ "allpmaps", &lock_class_mtx_spin },
 	{ "icu", &lock_class_mtx_spin },
-#ifdef SMP
-	{ "smp rendezvous", &lock_class_mtx_spin },
-#if defined(__i386__) || defined(__amd64__)
-	{ "tlb", &lock_class_mtx_spin },
-#endif
-#ifdef __sparc64__
+#if defined(SMP) && defined(__sparc64__)
 	{ "ipi", &lock_class_mtx_spin },
 #endif
+#ifdef __i386__
+	{ "allpmaps", &lock_class_mtx_spin },
+	{ "descriptor tables", &lock_class_mtx_spin },
 #endif
 	{ "clk", &lock_class_mtx_spin },
-	{ "mutex profiling lock", &lock_class_mtx_spin },
+	{ "mprof lock", &lock_class_mtx_spin },
 	{ "kse lock", &lock_class_mtx_spin },
 	{ "zombie lock", &lock_class_mtx_spin },
 	{ "ALD Queue", &lock_class_mtx_spin },