x86, smp: refactor ->smp_callin_clear_local_apic() methods

Only NUMAQ does something substantial here, because it initializes
via NMIs (not via INIT as standard SMP startup) - so it needs to
reset the APIC.

 - extend the generic code to handle NULL methods

 - clear out dummy methods and replace them with NULL

 - clean up: remove wrapper macros, etc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

5 files changed, 9 insertions, 5 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 40910bfd1b42..bd069e7b521c 100644
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -109,7 +109,8 @@ struct genapic apic_bigsmp = {
 
         .wait_for_init_deassert         = default_wait_for_init_deassert,
 
-        .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
+        .smp_callin_clear_local_apic    = NULL,
+
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = restore_NMI_vector,
         .inquire_remote_apic            = inquire_remote_apic,
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index c2464843df9e..a25e6eff048f 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -90,7 +90,7 @@ struct genapic apic_default = {
 
         .wait_for_init_deassert         = default_wait_for_init_deassert,
 
-        .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
+        .smp_callin_clear_local_apic    = NULL,
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = restore_NMI_vector,
         .inquire_remote_apic            = inquire_remote_apic,
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 4cb3984834ed..ab41b5439145 100644
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -145,7 +145,9 @@ struct genapic apic_es7000 = {
 
         .wait_for_init_deassert         = default_wait_for_init_deassert,
 
-        .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
+        /* 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,
         .inquire_remote_apic            = inquire_remote_apic,
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index fb03867e7c0f..4d3924f8cd0b 100644
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -110,7 +110,7 @@ struct genapic apic_numaq = {
         /* 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,
+        .smp_callin_clear_local_apic    = numaq_smp_callin_clear_local_apic,
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = 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 fdca78b96b6a..2595baa7997e 100644
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -89,7 +89,8 @@ struct genapic apic_summit = {
 
         .wait_for_init_deassert         = default_wait_for_init_deassert,
 
-        .smp_callin_clear_local_apic    = smp_callin_clear_local_apic,
+        .smp_callin_clear_local_apic    = NULL,
+
         .store_NMI_vector               = store_NMI_vector,
         .restore_NMI_vector             = restore_NMI_vector,
         .inquire_remote_apic            = inquire_remote_apic,