x86, smp: refactor ->inquire_remote_apic() methods

Nothing exciting - a few subarches dont want APIC remote reads to
be performed - the others are content with the default method.

 - 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>

diff --git a/arch/x86/include/asm/es7000/wakecpu.h b/arch/x86/include/asm/es7000/wakecpu.h
index 71a3a412d0e45d035e781ce5bd0969824e82bfcb..99c72be1840e9fcbc1eb85eefe060222f580146c 100644 (file)
--- a/arch/x86/include/asm/es7000/wakecpu.h
+++ b/arch/x86/include/asm/es7000/wakecpu.h
@@ -13,12 +13,4 @@ static inline void es7000_wait_for_init_deassert(atomic_t *deassert)
        return;
 }
 
-extern void __inquire_remote_apic(int apicid);
-
-static inline void inquire_remote_apic(int apicid)
-{
-       if (apic_verbosity >= APIC_DEBUG)
-               __inquire_remote_apic(apicid);
-}
-
 #endif /* __ASM_MACH_WAKECPU_H */

diff --git a/arch/x86/include/asm/mach-default/mach_wakecpu.h b/arch/x86/include/asm/mach-default/mach_wakecpu.h
index 656bb5e52bccd4fa3adb1d0cbbf3375701c8336f..b1cde560e4c1a8037bdcb3b5455db3225a94bb7d 100644 (file)
--- a/arch/x86/include/asm/mach-default/mach_wakecpu.h
+++ b/arch/x86/include/asm/mach-default/mach_wakecpu.h
@@ -16,7 +16,7 @@ static inline void __inquire_remote_apic(int apicid)
 }
 #endif /* CONFIG_SMP */
 
-static inline void inquire_remote_apic(int apicid)
+static inline void default_inquire_remote_apic(int apicid)
 {
        if (apic_verbosity >= APIC_DEBUG)
                __inquire_remote_apic(apicid);

diff --git a/arch/x86/include/asm/mach-generic/mach_wakecpu.h b/arch/x86/include/asm/mach-generic/mach_wakecpu.h
index 93207dfe8f50caf6205c2db441ca85e08c96de9b..0b884c03a3fc2adcfd21f22c6d10919942514ea0 100644 (file)
--- a/arch/x86/include/asm/mach-generic/mach_wakecpu.h
+++ b/arch/x86/include/asm/mach-generic/mach_wakecpu.h
@@ -1,6 +1,4 @@
 #ifndef _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H
 #define _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H
 
-#define inquire_remote_apic (apic->inquire_remote_apic)
-
 #endif /* _ASM_X86_MACH_GENERIC_MACH_APIC_H */

diff --git a/arch/x86/include/asm/numaq/wakecpu.h b/arch/x86/include/asm/numaq/wakecpu.h
index 920dcfefa83a478109981be56b26e719cd75ce49..afe81439c7dbcc68cd42956b9de8ff3c092da919 100644 (file)
--- a/arch/x86/include/asm/numaq/wakecpu.h
+++ b/arch/x86/include/asm/numaq/wakecpu.h
@@ -25,8 +25,4 @@ numaq_store_NMI_vector(unsigned short *high, unsigned short *low)
          *((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_LOW));
 }
 
-static inline void inquire_remote_apic(int apicid)
-{
-}
-
 #endif /* __ASM_NUMAQ_WAKECPU_H */

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 1492024592ffae8eb1cb3be6d0a6dea95f65595d..170adc5b6cb3b263daabb8584d5a7f204cf18c60 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -876,8 +876,8 @@ do_rest:
                        else
                                /* trampoline code not run */
                                printk(KERN_ERR "Not responding.\n");
-                       if (get_uv_system_type() != UV_NON_UNIQUE_APIC)
-                               inquire_remote_apic(apicid);
+                       if (apic->inquire_remote_apic)
+                               apic->inquire_remote_apic(apicid);
                }
        }
 

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index d9377af88cb3090f3c3715a92b45b4b1ffc7a7a1..4d8b2d442baec647887608ce1e51b3fe2088a561 100644 (file)
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -111,5 +111,5 @@ struct genapic apic_bigsmp = {
 
        .smp_callin_clear_local_apic    = NULL,
        .store_NMI_vector               = NULL,
-       .inquire_remote_apic            = inquire_remote_apic,
+       .inquire_remote_apic            = default_inquire_remote_apic,
 };

diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index b004257035c756945e197934258ef83907abadc2..c12dd2300a596621c05262398fbda898de03eb24 100644 (file)
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -92,5 +92,5 @@ struct genapic apic_default = {
 
        .smp_callin_clear_local_apic    = NULL,
        .store_NMI_vector               = NULL,
-       .inquire_remote_apic            = inquire_remote_apic,
+       .inquire_remote_apic            = default_inquire_remote_apic,
 };

diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 62673a8002ff7c26b5741c95ee36dc79e74b4837..be090b2037ca1f5ee611e49328547bad305eb0d8 100644 (file)
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -148,5 +148,5 @@ 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               = NULL,
-       .inquire_remote_apic            = inquire_remote_apic,
+       .inquire_remote_apic            = default_inquire_remote_apic,
 };

diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 2c3341564d145b83152daa66b165d007b93f7691..ddb50fba2868f772d9eae25a757289d471eb9aee 100644 (file)
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -112,5 +112,5 @@ struct genapic apic_numaq = {
 
        .smp_callin_clear_local_apic    = numaq_smp_callin_clear_local_apic,
        .store_NMI_vector               = numaq_store_NMI_vector,
-       .inquire_remote_apic            = inquire_remote_apic,
+       .inquire_remote_apic            = NULL,
 };

diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index c2471a9fa8f3548d84b0b68f6d5f8bd1ae15fab4..d5db3045437c0e8f257e7fab3da0c6a7976d8df9 100644 (file)
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -91,5 +91,5 @@ struct genapic apic_summit = {
 
        .smp_callin_clear_local_apic    = NULL,
        .store_NMI_vector               = NULL,
-       .inquire_remote_apic            = inquire_remote_apic,
+       .inquire_remote_apic            = default_inquire_remote_apic,
 };