5 files changed, 10 insertions, 13 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index bd069e7b521c..ecdb230d0f2e 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -110,8 +110,7 @@ struct genapic apic_bigsmp = {
         .wait_for_init_deassert         = default_wait_for_init_deassert,
 
         .smp_callin_clear_local_apic    = NULL,
-
-        .store_NMI_vector               = store_NMI_vector,
-        .restore_NMI_vector             = restore_NMI_vector,
+        .store_NMI_vector               = NULL,
+        .restore_NMI_vector             = NULL,
         .inquire_remote_apic            = inquire_remote_apic,
 };
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index a25e6eff048f..950925615a9e 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -91,7 +91,7 @@ struct genapic apic_default = {
         .wait_for_init_deassert         = default_wait_for_init_deassert,
 
         .smp_callin_clear_local_apic    = NULL,
-        .store_NMI_vector               = store_NMI_vector,
-        .restore_NMI_vector             = restore_NMI_vector,
+        .store_NMI_vector               = NULL,
+        .restore_NMI_vector             = NULL,
         .inquire_remote_apic            = inquire_remote_apic,
 };
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index ab41b5439145..131907091380 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -147,8 +147,7 @@ struct genapic apic_es7000 = {
 
         /* Nothing to do for most platforms, since cleared by the INIT cycle: */
         .smp_callin_clear_local_apic    = NULL,
-
-        .store_NMI_vector               = store_NMI_vector,
-        .restore_NMI_vector             = restore_NMI_vector,
+        .store_NMI_vector               = NULL,
+        .restore_NMI_vector             = NULL,
         .inquire_remote_apic            = inquire_remote_apic,
 };
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 4d3924f8cd0b..d7f7fcf21c39 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -111,7 +111,7 @@ struct genapic apic_numaq = {
         .wait_for_init_deassert         = NULL,
 
         .smp_callin_clear_local_apic    = numaq_smp_callin_clear_local_apic,
-        .store_NMI_vector               = store_NMI_vector,
-        .restore_NMI_vector             = restore_NMI_vector,
+        .store_NMI_vector               = numaq_store_NMI_vector,
+        .restore_NMI_vector             = numaq_restore_NMI_vector,
         .inquire_remote_apic            = inquire_remote_apic,
 };
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 2595baa7997e..46fca79f8310 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -90,8 +90,7 @@ struct genapic apic_summit = {
         .wait_for_init_deassert         = default_wait_for_init_deassert,
 
         .smp_callin_clear_local_apic    = NULL,
-
-        .store_NMI_vector               = store_NMI_vector,
-        .restore_NMI_vector             = restore_NMI_vector,
+        .store_NMI_vector               = NULL,
+        .restore_NMI_vector             = NULL,
         .inquire_remote_apic            = inquire_remote_apic,
 };