--- //depot/vendor/freebsd/src/sys/amd64/amd64/local_apic.c	2007/08/02 21:22:28
+++ //depot/user/attilio/attilio_smpng/amd64/amd64/local_apic.c	2007/09/03 00:07:25
@@ -1061,7 +1061,7 @@
 		printf("%s: Failed to setup the local APIC: returned %d\n",
 		    best_enum->apic_name, retval);
 }
-SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_FIRST, apic_setup_local, NULL)
+SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL)
 
 /*
  * Setup the I/O APICs.
--- //depot/vendor/freebsd/src/sys/i386/acpica/madt.c	2007/05/08 22:03:14
+++ //depot/user/attilio/attilio_smpng/i386/acpica/madt.c	2007/09/03 00:07:25
@@ -406,7 +406,7 @@
 
 	apic_register_enumerator(&madt_enumerator);
 }
-SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, madt_register, NULL)
+SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_SECOND, madt_register, NULL)
 
 /*
  * Call the handler routine for each entry in the MADT table.
--- //depot/vendor/freebsd/src/sys/i386/i386/local_apic.c	2007/08/02 21:22:28
+++ //depot/user/attilio/attilio_smpng/i386/i386/local_apic.c	2007/09/03 00:07:25
@@ -1065,7 +1065,7 @@
 		printf("%s: Failed to setup the local APIC: returned %d\n",
 		    best_enum->apic_name, retval);
 }
-SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_FIRST, apic_init, NULL)
+SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_SECOND, apic_init, NULL)
 
 /*
  * Setup the I/O APICs.
--- //depot/vendor/freebsd/src/sys/kern/subr_smp.c	2007/07/03 18:44:26
+++ //depot/user/attilio/attilio_smpng/kern/subr_smp.c	2007/09/03 00:07:25
@@ -148,7 +148,7 @@
 	    mp_ncpus);
 	cpu_mp_announce();
 }
-SYSINIT(cpu_mp, SI_SUB_CPU, SI_ORDER_SECOND, mp_start, NULL)
+SYSINIT(cpu_mp, SI_SUB_CPU, SI_ORDER_THIRD, mp_start, NULL)
 
 void
 forward_signal(struct thread *td)
--- //depot/vendor/freebsd/src/sys/sun4v/mdesc/mdesc_init.c	2006/12/24 07:47:39
+++ //depot/user/attilio/attilio_smpng/sun4v/mdesc/mdesc_init.c	2007/09/03 00:07:25
@@ -53,7 +53,7 @@
  * can kill off all calls to OBP. OBP removal is not in
  * the critical path for sun4v at this time.
  */
-SYSINIT(mdesc_init, SI_SUB_CPU, SI_ORDER_FIRST, mdesc_postvm_init, NULL);
+SYSINIT(mdesc_init, SI_SUB_CPU, SI_ORDER_SECOND, mdesc_postvm_init, NULL);
 
 
 #define UNIMPLEMENTED panic("%s not implemented.", __FUNCTION__)