x86, apic: clean up check_apicid*() callbacks

Clean up these methods - to make it clearer which function is
used in which case.

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

diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h
index 7e6e33a6db02459804bb1067e1389e71cf449aa2..bd52d4d86f0e404bbe6ff9765266ec25e2686f49 100644 (file)
--- a/arch/x86/include/asm/bigsmp/apic.h
+++ b/arch/x86/include/asm/bigsmp/apic.h
@@ -20,14 +20,15 @@ static inline const cpumask_t *bigsmp_target_cpus(void)
 #define APIC_DFR_VALUE         (APIC_DFR_FLAT)
 #define NO_BALANCE_IRQ         (0)
 
-static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+static inline unsigned long
+bigsmp_check_apicid_used(physid_mask_t bitmap, int apicid)
 {
-       return (0);
+       return 0;
 }
 
-static inline unsigned long check_apicid_present(int bit)
+static inline unsigned long bigsmp_check_apicid_present(int bit)
 {
-       return (1);
+       return 1;
 }
 
 static inline unsigned long calculate_ldr(int cpu)

diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
index 0d770fce4b2868754fc13c5dee91d83ebee323ed..cd888daa19308380f8c24d9c9bfe3146e7d0b630 100644 (file)
--- a/arch/x86/include/asm/es7000/apic.h
+++ b/arch/x86/include/asm/es7000/apic.h
@@ -28,11 +28,12 @@ static inline const cpumask_t *es7000_target_cpus(void)
 #define APIC_DFR_VALUE         (APIC_DFR_FLAT)
 #define NO_BALANCE_IRQ         (0)
 
-static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+static inline unsigned long
+es7000_check_apicid_used(physid_mask_t bitmap, int apicid)
 {
        return 0;
 }
-static inline unsigned long check_apicid_present(int bit)
+static inline unsigned long es7000_check_apicid_present(int bit)
 {
        return physid_isset(bit, phys_cpu_present_map);
 }

diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
index 5f8d17fdc9653d3e761c9a620ee286f7e83bfd5d..064bc11a991c042d1a1d9551eab5fe46ef731b2b 100644 (file)
--- a/arch/x86/include/asm/mach-default/mach_apic.h
+++ b/arch/x86/include/asm/mach-default/mach_apic.h
@@ -105,12 +105,12 @@ static inline void vector_allocation_domain(int cpu, struct cpumask *retmask)
 }
 #endif
 
-static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+static inline unsigned long default_check_apicid_used(physid_mask_t bitmap, int apicid)
 {
        return physid_isset(apicid, bitmap);
 }
 
-static inline unsigned long check_apicid_present(int bit)
+static inline unsigned long default_check_apicid_present(int bit)
 {
        return physid_isset(bit, phys_cpu_present_map);
 }

diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h
index 00d5fe6e67698c71f9f3a22b32d71d73c70fec58..e035f88dfcdec7d65a761eda450224d18e2aa756 100644 (file)
--- a/arch/x86/include/asm/mach-generic/mach_apic.h
+++ b/arch/x86/include/asm/mach-generic/mach_apic.h
@@ -13,9 +13,7 @@
 #define cpu_present_to_apicid (apic->cpu_present_to_apicid)
 #define apicid_to_cpu_present (apic->apicid_to_cpu_present)
 #define setup_portio_remap (apic->setup_portio_remap)
-#define check_apicid_present (apic->check_apicid_present)
 #define check_phys_apicid_present (apic->check_phys_apicid_present)
-#define check_apicid_used (apic->check_apicid_used)
 #define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)
 #define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)
 #define vector_allocation_domain (apic->vector_allocation_domain)

diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h
index 8ecb3b45c6c4160487d1a56e17ec6232f3a7548b..571fdaeafaa88bbe916aae6fbecded4205878f49 100644 (file)
--- a/arch/x86/include/asm/numaq/apic.h
+++ b/arch/x86/include/asm/numaq/apic.h
@@ -14,11 +14,12 @@ static inline const cpumask_t *numaq_target_cpus(void)
 
 #define NO_BALANCE_IRQ (1)
 
-static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+static inline unsigned long
+numaq_check_apicid_used(physid_mask_t bitmap, int apicid)
 {
        return physid_isset(apicid, bitmap);
 }
-static inline unsigned long check_apicid_present(int bit)
+static inline unsigned long numaq_check_apicid_present(int bit)
 {
        return physid_isset(bit, phys_cpu_present_map);
 }

diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h
index 84679e687add0829477f3a03bde27be93b9b182d..482038b244b06a0b80eff2e0030c65533876c0db 100644 (file)
--- a/arch/x86/include/asm/summit/apic.h
+++ b/arch/x86/include/asm/summit/apic.h
@@ -23,13 +23,14 @@ static inline const cpumask_t *summit_target_cpus(void)
        return &cpumask_of_cpu(0);
 }
 
-static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+static inline unsigned long
+summit_check_apicid_used(physid_mask_t bitmap, int apicid)
 {
        return 0;
 }
 
 /* we don't use the phys_cpu_present_map to indicate apicid presence */
-static inline unsigned long check_apicid_present(int bit)
+static inline unsigned long summit_check_apicid_present(int bit)
 {
        return 1;
 }

diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 7f8b32b20897821f353e0428aec2176fee8eb060..733ecf17272430a0331b662619fcde471e1f2ea4 100644 (file)
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -2135,7 +2135,7 @@ static void __init setup_ioapic_ids_from_mpc(void)
                 * system must have a unique ID or we get lots of nice
                 * 'stuck on smp_invalidate_needed IPI wait' messages.
                 */
-               if (check_apicid_used(phys_id_present_map,
+               if (apic->check_apicid_used(phys_id_present_map,
                                        mp_ioapics[apic_id].apicid)) {
                        printk(KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n",
                                apic_id, mp_ioapics[apic_id].apicid);
@@ -3878,10 +3878,10 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id)
         * Every APIC in a system must have a unique ID or we get lots of nice
         * 'stuck on smp_invalidate_needed IPI wait' messages.
         */
-       if (check_apicid_used(apic_id_map, apic_id)) {
+       if (apic->check_apicid_used(apic_id_map, apic_id)) {
 
                for (i = 0; i < get_physical_broadcast(); i++) {
-                       if (!check_apicid_used(apic_id_map, i))
+                       if (!apic->check_apicid_used(apic_id_map, i))
                                break;
                }
 

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 7c52840f20502324e623bafef1056648a6751765..aa8443f6c0f7527d2926b93cc15c5d3e35851483 100644 (file)
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -71,8 +71,8 @@ struct genapic apic_bigsmp = {
        .target_cpus                    = bigsmp_target_cpus,
        .disable_esr                    = 1,
        .dest_logical                   = 0,
-       .check_apicid_used              = check_apicid_used,
-       .check_apicid_present           = check_apicid_present,
+       .check_apicid_used              = bigsmp_check_apicid_used,
+       .check_apicid_present           = bigsmp_check_apicid_present,
 
        .no_balance_irq                 = NO_BALANCE_IRQ,
        .no_ioapic_check                = 0,

diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 53fa1ad831842468c3bb8c1cf2b2c9cdf00f2299..47f6b5b06ba140a12786b2ae285869c4f66f63ba 100644 (file)
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -38,8 +38,8 @@ struct genapic apic_default = {
        .target_cpus                    = default_target_cpus,
        .disable_esr                    = 0,
        .dest_logical                   = APIC_DEST_LOGICAL,
-       .check_apicid_used              = check_apicid_used,
-       .check_apicid_present           = check_apicid_present,
+       .check_apicid_used              = default_check_apicid_used,
+       .check_apicid_present           = default_check_apicid_present,
 
        .no_balance_irq                 = NO_BALANCE_IRQ,
        .no_ioapic_check                = 0,

diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 50fed0225cda8146ca682a038cd570050d9e00cb..5633f3296e1c360979e0477fb32be113792c38a0 100644 (file)
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -114,8 +114,8 @@ struct genapic apic_es7000 = {
        .target_cpus                    = es7000_target_cpus,
        .disable_esr                    = 1,
        .dest_logical                   = 0,
-       .check_apicid_used              = check_apicid_used,
-       .check_apicid_present           = check_apicid_present,
+       .check_apicid_used              = es7000_check_apicid_used,
+       .check_apicid_present           = es7000_check_apicid_present,
 
        .no_balance_irq                 = NO_BALANCE_IRQ,
        .no_ioapic_check                = 0,

diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 1fb1b1a4aa00fe327835cf7987c0a8ab626806b4..d85206d8e4ae52ca048a5bc2788b5314ecac6167 100644 (file)
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -58,8 +58,8 @@ struct genapic apic_numaq = {
        .target_cpus                    = numaq_target_cpus,
        .disable_esr                    = 1,
        .dest_logical                   = APIC_DEST_LOGICAL,
-       .check_apicid_used              = check_apicid_used,
-       .check_apicid_present           = check_apicid_present,
+       .check_apicid_used              = numaq_check_apicid_used,
+       .check_apicid_present           = numaq_check_apicid_present,
 
        .no_balance_irq                 = NO_BALANCE_IRQ,
        .no_ioapic_check                = 0,

diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 5c27d4d824e597413042b49772f8782a05739229..f54cf73d3edb417d1392002f82b06678b5a8ad72 100644 (file)
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -51,8 +51,8 @@ struct genapic apic_summit = {
        .target_cpus                    = summit_target_cpus,
        .disable_esr                    = 1,
        .dest_logical                   = APIC_DEST_LOGICAL,
-       .check_apicid_used              = check_apicid_used,
-       .check_apicid_present           = check_apicid_present,
+       .check_apicid_used              = summit_check_apicid_used,
+       .check_apicid_present           = summit_check_apicid_present,
 
        .no_balance_irq                 = NO_BALANCE_IRQ,
        .no_ioapic_check                = 0,