3 files changed, 9 insertions, 13 deletions
diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h
index c2113c1aa5..9765dfd482 100644
--- a/src/include/cpu/cpu.h
+++ b/src/include/cpu/cpu.h
@@ -4,10 +4,12 @@
 #include <arch/cpu.h>
 
 #if !defined(__ROMCC__)
-void cpu_initialize(void);
+void cpu_initialize(struct bus *cpu_bus, int index);
 struct bus;
 void initialize_cpus(struct bus *cpu_bus);
-void secondary_cpu_init(void);
+void secondary_cpu_init(int index);
+
+extern unsigned int cpucount;
 
 #if !CONFIG_WAIT_BEFORE_CPUS_INIT
 	#define cpus_ready_for_init() do {} while(0)
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 078f2a7c62..5c48025c8f 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -52,20 +52,13 @@ static inline __attribute__((always_inline)) unsigned long lapicid(void)
 }
 
 #ifndef __ROMCC__
-#if CONFIG_AP_IN_SIPI_WAIT != 1
-/* If we need to go back to sipi wait, we use the long non-inlined version of
- * this function in lapic_cpu_init.c
- */
 static inline __attribute__((always_inline)) void stop_this_cpu(void)
 {
-	/* Called by an AP when it is ready to halt and wait for a new task */
-	for(;;) {
-		hlt();
-	}
+       /* Called by an AP when it is ready to halt and wait for a new task */
+       for(;;) {
+               hlt();
+       }
 }
-#else
-void stop_this_cpu(void);
-#endif
 
 #if !defined(__PRE_RAM__)
 
diff --git a/src/include/device/path.h b/src/include/device/path.h
index 63e95380c4..018fb9313f 100644
--- a/src/include/device/path.h
+++ b/src/include/device/path.h
@@ -40,6 +40,7 @@ struct apic_path
 	unsigned apic_id;
 	unsigned node_id;
 	unsigned core_id;
+	unsigned index;
 };
 
 struct apic_cluster_path