Index: amd64/amd64/mp_machdep.c
===================================================================
RCS file: /home/ncvs/src/sys/amd64/amd64/mp_machdep.c,v
retrieving revision 1.270
diff -u -r1.270 mp_machdep.c
--- amd64/amd64/mp_machdep.c	9 Mar 2006 16:38:52 -0000	1.270
+++ amd64/amd64/mp_machdep.c	9 Mar 2006 18:59:37 -0000
@@ -499,6 +499,12 @@
 	/* Disable local APIC just to be sure. */
 	lapic_disable();
 
+	/*
+	 * Turn off interrupts.  They will be enabled when we perform our
+	 * first context switch.
+	 */
+	disable_intr();
+
 	/* signal our startup to the BSP. */
 	mp_naps++;
 
Index: i386/i386/mp_machdep.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/i386/mp_machdep.c,v
retrieving revision 1.264
diff -u -r1.264 mp_machdep.c
--- i386/i386/mp_machdep.c	9 Mar 2006 16:38:52 -0000	1.264
+++ i386/i386/mp_machdep.c	9 Mar 2006 18:59:37 -0000
@@ -537,6 +537,12 @@
 	/* Disable local APIC just to be sure. */
 	lapic_disable();
 
+	/*
+	 * Turn off interrupts.  They will be enabled when we perform our
+	 * first context switch.
+	 */
+	disable_intr();
+
 	/* signal our startup to the BSP. */
 	mp_naps++;
 	CHECK_WRITE(0x39, 6);