x86: clean up apic->apic_id_registered() methods

Impact: cleanup

x86 subarchitectures each defined a "apic_id_registered()" method,
which could be an inline function depending on which subarch we build
for, and which was also the name of a genapic field.

Untangle this namespace spaghetti by giving each of the instances
a separate name.

Also remove wrapper macro obfuscation.

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 d8dd9f537911fb2a6e98f5c7d68cd2121cfd6ecc..42c56df3ff32d2331bd11c46f17c7dde419c45a1 100644 (file)
--- a/arch/x86/include/asm/bigsmp/apic.h
+++ b/arch/x86/include/asm/bigsmp/apic.h
@@ -4,9 +4,9 @@
 #define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu))
 #define esr_disable (1)
 
-static inline int apic_id_registered(void)
+static inline int bigsmp_apic_id_registered(void)
 {
-       return (1);
+       return 1;
 }
 
 static inline const cpumask_t *target_cpus(void)

diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
index c58b9cc744657a6e22349e48a02ec4e22fc17d46..a1819b510de35856981eb157f92422d82a9a5660 100644 (file)
--- a/arch/x86/include/asm/es7000/apic.h
+++ b/arch/x86/include/asm/es7000/apic.h
@@ -6,9 +6,9 @@
 #define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu)
 #define esr_disable (1)
 
-static inline int apic_id_registered(void)
+static inline int es7000_apic_id_registered(void)
 {
-               return (1);
+               return 1;
 }
 
 static inline const cpumask_t *target_cpus_cluster(void)

diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
index 2448b927b644200ee6804036f9938878435fd0ec..6a454fa0b433204eb3d2581743473f216eb6a66b 100644 (file)
--- a/arch/x86/include/asm/mach-default/mach_apic.h
+++ b/arch/x86/include/asm/mach-default/mach_apic.h
@@ -25,7 +25,6 @@ static inline const struct cpumask *target_cpus(void)
 #define INT_DELIVERY_MODE (apic->int_delivery_mode)
 #define INT_DEST_MODE (apic->int_dest_mode)
 #define TARGET_CPUS      (apic->target_cpus())
-#define apic_id_registered (apic->apic_id_registered)
 #define init_apic_ldr (apic->init_apic_ldr)
 #define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)
 #define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)
@@ -57,7 +56,7 @@ static inline void init_apic_ldr(void)
        apic_write(APIC_LDR, val);
 }
 
-static inline int apic_id_registered(void)
+static inline int default_apic_id_registered(void)
 {
        return physid_isset(read_apic_id(), 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 59972d94ff18b03127e80921d637b2a29d10c037..cc6e9d70f06e2e2f284c8c56e17aab9ed08199c9 100644 (file)
--- a/arch/x86/include/asm/mach-generic/mach_apic.h
+++ b/arch/x86/include/asm/mach-generic/mach_apic.h
@@ -10,7 +10,6 @@
 #undef APIC_DEST_LOGICAL
 #define APIC_DEST_LOGICAL (apic->apic_destination_logical)
 #define TARGET_CPUS      (apic->target_cpus())
-#define apic_id_registered (apic->apic_id_registered)
 #define init_apic_ldr (apic->init_apic_ldr)
 #define ioapic_phys_id_map (apic->ioapic_phys_id_map)
 #define setup_apic_routing (apic->setup_apic_routing)

diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h
index bf37bc49bd8e4f11fc43acdde6dfee52f9b8c43b..59b62b19d02c13b39da7c8cc0528542a23e195a6 100644 (file)
--- a/arch/x86/include/asm/numaq/apic.h
+++ b/arch/x86/include/asm/numaq/apic.h
@@ -28,7 +28,7 @@ static inline unsigned long check_apicid_present(int bit)
 }
 #define apicid_cluster(apicid) (apicid & 0xF0)
 
-static inline int apic_id_registered(void)
+static inline int numaq_apic_id_registered(void)
 {
        return 1;
 }

diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h
index 93d2c8667cfea885b8f1c20f1bf0f579f3f5216f..a36ef6e4b1ff4a6165ca695dba8d936b37cadfbc 100644 (file)
--- a/arch/x86/include/asm/summit/apic.h
+++ b/arch/x86/include/asm/summit/apic.h
@@ -74,7 +74,7 @@ static inline int multi_timer_check(int apic, int irq)
        return 0;
 }
 
-static inline int apic_id_registered(void)
+static inline int summit_apic_id_registered(void)
 {
        return 1;
 }

diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index c6f15647eba923e3ae909f770ada7c01485edb45..b6740de18fbba0564590557cc8a5ff1d9f1f5546 100644 (file)
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1171,7 +1171,7 @@ void __cpuinit setup_local_APIC(void)
         * Double-check whether this APIC is really registered.
         * This is meaningless in clustered apic mode, so we skip it.
         */
-       if (!apic_id_registered())
+       if (!apic->apic_id_registered())
                BUG();
 
        /*

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 22c3608b80dd079b5a62aa04939973584894de2d..17abf5c624299747884e15b8309491e0cc83bc5b 100644 (file)
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -62,7 +62,7 @@ struct genapic apic_bigsmp = {
        .name                           = "bigsmp",
        .probe                          = probe_bigsmp,
        .acpi_madt_oem_check            = NULL,
-       .apic_id_registered             = apic_id_registered,
+       .apic_id_registered             = bigsmp_apic_id_registered,
 
        .int_delivery_mode              = INT_DELIVERY_MODE,
        .int_dest_mode                  = INT_DEST_MODE,

diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index cfec3494a967f8368e368ae63a4b715c4ac8d700..1f30559e9d8d45ff7f6f8a9aaf58531c63fb4cff 100644 (file)
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -29,7 +29,7 @@ struct genapic apic_default = {
        .name                           = "default",
        .probe                          = probe_default,
        .acpi_madt_oem_check            = NULL,
-       .apic_id_registered             = apic_id_registered,
+       .apic_id_registered             = default_apic_id_registered,
 
        .int_delivery_mode              = INT_DELIVERY_MODE,
        .int_dest_mode                  = INT_DEST_MODE,

diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 23fe6f1c9691f09aedef7b3ed2c7b63791b29e8d..d68ca0bce6757f434760d488ccd26af385ee0681 100644 (file)
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -105,7 +105,7 @@ struct genapic apic_es7000 = {
        .name                           = "es7000",
        .probe                          = probe_es7000,
        .acpi_madt_oem_check            = es7000_acpi_madt_oem_check,
-       .apic_id_registered             = apic_id_registered,
+       .apic_id_registered             = es7000_apic_id_registered,
 
        .int_delivery_mode              = INT_DELIVERY_MODE,
        .int_dest_mode                  = INT_DEST_MODE,

diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index 9691b4e1654dd7f84826b5588a4553b47577b1f2..b22a79b15b191739fc32ee74e212f6c257a08dc6 100644 (file)
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -49,7 +49,7 @@ struct genapic apic_numaq = {
        .name                           = "NUMAQ",
        .probe                          = probe_numaq,
        .acpi_madt_oem_check            = NULL,
-       .apic_id_registered             = apic_id_registered,
+       .apic_id_registered             = numaq_apic_id_registered,
 
        .int_delivery_mode              = INT_DELIVERY_MODE,
        .int_dest_mode                  = INT_DEST_MODE,

diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 0eea9fbb2a50a6d7b650e9b8a34242d281156296..744fa1b86ef4f763de7996cc44902ad3e04baafb 100644 (file)
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -42,7 +42,7 @@ struct genapic apic_summit = {
        .name                           = "summit",
        .probe                          = probe_summit,
        .acpi_madt_oem_check            = summit_acpi_madt_oem_check,
-       .apic_id_registered             = apic_id_registered,
+       .apic_id_registered             = summit_apic_id_registered,
 
        .int_delivery_mode              = INT_DELIVERY_MODE,
        .int_dest_mode                  = INT_DEST_MODE,