5 files changed, 16 insertions, 5 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index a317fbe07fdf..40910bfd1b42 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -106,7 +106,9 @@ struct genapic apic_bigsmp = {
         .wakeup_cpu                     = NULL,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
-        .wait_for_init_deassert         = wait_for_init_deassert,
+
+        .wait_for_init_deassert         = default_wait_for_init_deassert,
+
         .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = restore_NMI_vector,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 17d8f9c22180..c2464843df9e 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -87,7 +87,9 @@ struct genapic apic_default = {
         .wakeup_cpu                     = NULL,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
-        .wait_for_init_deassert         = wait_for_init_deassert,
+
+        .wait_for_init_deassert         = default_wait_for_init_deassert,
+
         .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = restore_NMI_vector,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 871e85445e21..4cb3984834ed 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -142,7 +142,9 @@ struct genapic apic_es7000 = {
         .wakeup_cpu                     = NULL,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
-        .wait_for_init_deassert         = wait_for_init_deassert,
+
+        .wait_for_init_deassert         = default_wait_for_init_deassert,
+
         .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = restore_NMI_vector,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 0b496ab5450c..fb03867e7c0f 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -106,7 +106,10 @@ struct genapic apic_numaq = {
         .wakeup_cpu                     = NULL,
         .trampoline_phys_low            = NUMAQ_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = NUMAQ_TRAMPOLINE_PHYS_HIGH,
-        .wait_for_init_deassert         = wait_for_init_deassert,
+
+        /* We don't do anything here because we use NMI's to boot instead */
+        .wait_for_init_deassert         = NULL,
+
         .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = restore_NMI_vector,
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index c4799cd34592..fdca78b96b6a 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -86,7 +86,9 @@ struct genapic apic_summit = {
         .wakeup_cpu                     = NULL,
         .trampoline_phys_low            = DEFAULT_TRAMPOLINE_PHYS_LOW,
         .trampoline_phys_high           = DEFAULT_TRAMPOLINE_PHYS_HIGH,
-        .wait_for_init_deassert         = wait_for_init_deassert,
+
+        .wait_for_init_deassert         = default_wait_for_init_deassert,
+
         .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = restore_NMI_vector,