11 files changed, 12 insertions, 23 deletions

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 0fbf6f1520fa..4ef949c1972e 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -313,7 +313,7 @@ struct apic {
         void (*send_IPI_self)(int vector);
 
         /* wakeup_secondary_cpu */
-        int (*wakeup_cpu)(int apicid, unsigned long start_eip);
+        int (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip);
 
         int trampoline_phys_low;
         int trampoline_phys_high;
@@ -344,13 +344,6 @@ extern struct apic *apic;
 #ifdef CONFIG_SMP
 extern atomic_t init_deasserted;
 extern int wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip);
-extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
-#else
-static inline int
-wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip)
-{
-        return 0;
-}
 #endif
 
 static inline u32 apic_read(u32 reg)
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 00595bc2da8d..f933822dba18 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -222,7 +222,6 @@ struct apic apic_flat =  {
         .send_IPI_all                   = flat_send_IPI_all,
         .send_IPI_self                  = apic_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
@@ -373,7 +372,6 @@ struct apic apic_physflat =  {
         .send_IPI_all                   = physflat_send_IPI_all,
         .send_IPI_self                  = apic_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 8c25917b51a0..69c512e23a9f 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -256,7 +256,6 @@ struct apic apic_bigsmp = {
         .send_IPI_all                   = bigsmp_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
 
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 9f6102fc87a1..b4838ed3f26a 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -741,7 +741,7 @@ struct apic apic_es7000_cluster = {
         .send_IPI_all                   = es7000_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_mip,
+        .wakeup_secondary_cpu           = wakeup_secondary_cpu_via_mip,
 
         .trampoline_phys_low            = 0x467,
         .trampoline_phys_high           = 0x469,
@@ -806,8 +806,6 @@ struct apic apic_es7000 = {
         .send_IPI_all                   = es7000_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
-
         .trampoline_phys_low            = 0x467,
         .trampoline_phys_high           = 0x469,
 
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index c503c1799d63..a7f711f5110a 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -538,7 +538,7 @@ struct apic apic_numaq = {
         .send_IPI_all                   = numaq_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_nmi,
+        .wakeup_secondary_cpu           = wakeup_secondary_cpu_via_nmi,
         .trampoline_phys_low            = NUMAQ_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = NUMAQ_TRAMPOLINE_PHYS_HIGH,
 
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 13c6fc7dff99..141c99a1c264 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -138,7 +138,6 @@ struct apic apic_default = {
         .send_IPI_all                   = default_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
 
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index 5a75d563f676..0a1135c5a6de 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -574,7 +574,6 @@ struct apic apic_summit = {
         .send_IPI_all                   = summit_send_IPI_all,
         .send_IPI_self                  = default_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
 
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 561a6b1042ae..8fb87b6dd633 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -224,7 +224,6 @@ struct apic apic_x2apic_cluster = {
         .send_IPI_all                   = x2apic_send_IPI_all,
         .send_IPI_self                  = x2apic_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 785f8ee4b1df..23625b9f98b2 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -213,7 +213,6 @@ struct apic apic_x2apic_phys = {
         .send_IPI_all                   = x2apic_send_IPI_all,
         .send_IPI_self                  = x2apic_send_IPI_self,
 
-        .wakeup_cpu                     = wakeup_secondary_cpu_via_init,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 6d7b9d960ddc..7151de74a396 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -288,7 +288,7 @@ struct apic apic_x2apic_uv_x = {
         .send_IPI_all                   = uv_send_IPI_all,
         .send_IPI_self                  = uv_send_IPI_self,
 
-        .wakeup_cpu                     = uv_wakeup_secondary,
+        .wakeup_secondary_cpu           = uv_wakeup_secondary,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
         .wait_for_init_deassert         = NULL,
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 9b338aa03b40..249334f5080a 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -742,7 +742,8 @@ static void __cpuinit do_fork_idle(struct work_struct *work)
 /*
  * NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad
  * (ie clustered apic addressing mode), this is a LOGICAL apic ID.
- * Returns zero if CPU booted OK, else error code from ->wakeup_cpu.
+ * Returns zero if CPU booted OK, else error code from
+ * ->wakeup_secondary_cpu.
  */
 static int __cpuinit do_boot_cpu(int apicid, int cpu)
 {
@@ -829,9 +830,13 @@ do_rest:
         }
 
         /*
-         * Starting actual IPI sequence...
+         * Kick the secondary CPU. Use the method in the APIC driver
+         * if it's defined - or use an INIT boot APIC message otherwise:
          */
-        boot_error = apic->wakeup_cpu(apicid, start_ip);
+        if (apic->wakeup_secondary_cpu)
+                boot_error = apic->wakeup_secondary_cpu(apicid, start_ip);
+        else
+                boot_error = wakeup_secondary_cpu_via_init(apicid, start_ip);
 
         if (!boot_error) {
                 /*