x86, apic: refactor ->apic_id_mask & APIC_ID_MASK

- spread out the namespace on a per driver basis

 - get rid of wrapper macros

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

diff --git a/arch/x86/include/asm/bigsmp/apicdef.h b/arch/x86/include/asm/bigsmp/apicdef.h
index ed25dd6503b27dd4afd226c1a75a0bfa4fdd512f..6e587818c7ed6a19b09e699be669e55b6851a297 100644 (file)
--- a/arch/x86/include/asm/bigsmp/apicdef.h
+++ b/arch/x86/include/asm/bigsmp/apicdef.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_MACH_APICDEF_H
 #define __ASM_MACH_APICDEF_H
 
-#define                APIC_ID_MASK            (0xFF<<24)
+#define                BIGSMP_APIC_ID_MASK             (0xFF<<24)
 
 static inline unsigned bigsmp_get_apic_id(unsigned long x)
 {

diff --git a/arch/x86/include/asm/es7000/apicdef.h b/arch/x86/include/asm/es7000/apicdef.h
index e23791762a19c752b15909714a644893bc3c4bf5..476da0c7f5cc5458a360ec409a4da6f61aa040f9 100644 (file)
--- a/arch/x86/include/asm/es7000/apicdef.h
+++ b/arch/x86/include/asm/es7000/apicdef.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_ES7000_APICDEF_H
 #define __ASM_ES7000_APICDEF_H
 
-#define                APIC_ID_MASK            (0xFF<<24)
+#define                ES7000_APIC_ID_MASK             (0xFF<<24)
 
 static inline unsigned int es7000_get_apic_id(unsigned long x)
 {

diff --git a/arch/x86/include/asm/mach-default/mach_apicdef.h b/arch/x86/include/asm/mach-default/mach_apicdef.h
index e84d437ba2b2beb3d6acd952d0dae6c60e5ad67b..8318d121ea6616927edf980969bb9539991e064d 100644 (file)
--- a/arch/x86/include/asm/mach-default/mach_apicdef.h
+++ b/arch/x86/include/asm/mach-default/mach_apicdef.h
@@ -4,10 +4,9 @@
 #include <asm/apic.h>
 
 #ifdef CONFIG_X86_64
-#define        APIC_ID_MASK            (apic->apic_id_mask)
 #define        SET_APIC_ID(x)          (apic->set_apic_id(x))
 #else
-#define                APIC_ID_MASK            (0xF<<24)
+#define                DEFAULT_APIC_ID_MASK    (0x0F<<24)
 
 static inline unsigned default_get_apic_id(unsigned long x) 
 {

diff --git a/arch/x86/include/asm/mach-generic/mach_apicdef.h b/arch/x86/include/asm/mach-generic/mach_apicdef.h
index 645520bcd2c2e41949affea509aacf415ad2946a..61caa65b13fb58b164eceef3869ad5b3b029c4b4 100644 (file)
--- a/arch/x86/include/asm/mach-generic/mach_apicdef.h
+++ b/arch/x86/include/asm/mach-generic/mach_apicdef.h
@@ -3,8 +3,6 @@
 
 #ifndef APIC_DEFINITION
 #include <asm/genapic.h>
-
-#define APIC_ID_MASK (apic->apic_id_mask)
 #endif
 
 #endif /* _ASM_X86_MACH_GENERIC_MACH_APICDEF_H */

diff --git a/arch/x86/include/asm/numaq/apicdef.h b/arch/x86/include/asm/numaq/apicdef.h
index 29f5e3d34e5b28f2e2bd3e01d77669e49b34a0e8..6f2cc5df0b15e9bc565cb44c12d07cefc5e98bac 100644 (file)
--- a/arch/x86/include/asm/numaq/apicdef.h
+++ b/arch/x86/include/asm/numaq/apicdef.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_NUMAQ_APICDEF_H
 #define __ASM_NUMAQ_APICDEF_H
 
-#define APIC_ID_MASK (0xF<<24)
+#define NUMAQ_APIC_ID_MASK (0xF<<24)
 
 static inline unsigned int numaq_get_apic_id(unsigned long x)
 {

diff --git a/arch/x86/include/asm/summit/apicdef.h b/arch/x86/include/asm/summit/apicdef.h
index 4286528af7c654083cce92464a5312d75c8db691..0373f0c7b5dbef42057ebf8ee15db48f88a47d44 100644 (file)
--- a/arch/x86/include/asm/summit/apicdef.h
+++ b/arch/x86/include/asm/summit/apicdef.h
@@ -1,7 +1,7 @@
 #ifndef __ASM_SUMMIT_APICDEF_H
 #define __ASM_SUMMIT_APICDEF_H
 
-#define                APIC_ID_MASK            (0xFF<<24)
+#define                SUMMIT_APIC_ID_MASK             (0xFF<<24)
 
 static inline unsigned summit_get_apic_id(unsigned long x)
 {

diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 9d6374da47844279f74de6d22918504ca9d2e705..5f7f3a9a47ad11a2ad99f602ebc2aefbfc439c77 100644 (file)
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1009,11 +1009,11 @@ int __init verify_local_APIC(void)
         */
        reg0 = apic_read(APIC_ID);
        apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0);
-       apic_write(APIC_ID, reg0 ^ APIC_ID_MASK);
+       apic_write(APIC_ID, reg0 ^ apic->apic_id_mask);
        reg1 = apic_read(APIC_ID);
        apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1);
        apic_write(APIC_ID, reg0);
-       if (reg1 != (reg0 ^ APIC_ID_MASK))
+       if (reg1 != (reg0 ^ apic->apic_id_mask))
                return 0;
 
        /*

diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c
index ab47091dac2b98b366a3073ccd19b2b7f10eb1d6..78baa55cd0e9a4d8128a1f69580dc2b3eafcd548 100644 (file)
--- a/arch/x86/kernel/genapic_flat_64.c
+++ b/arch/x86/kernel/genapic_flat_64.c
@@ -352,7 +352,7 @@ struct genapic apic_physflat =  {
 
        .get_apic_id                    = flat_get_apic_id,
        .set_apic_id                    = set_apic_id,
-       .apic_id_mask                   = 0xFFu<<24,
+       .apic_id_mask                   = 0xFFu << 24,
 
        .cpu_mask_to_apicid             = physflat_cpu_mask_to_apicid,
        .cpu_mask_to_apicid_and         = physflat_cpu_mask_to_apicid_and,

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 9eca977227c457140ad9fd77a2e33c69fba52838..1f4ad4f77022fad67f5b9d1f033dcc0e1aaccbd9 100644 (file)
--- a/arch/x86/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -92,7 +92,7 @@ struct genapic apic_bigsmp = {
 
        .get_apic_id                    = bigsmp_get_apic_id,
        .set_apic_id                    = NULL,
-       .apic_id_mask                   = APIC_ID_MASK,
+       .apic_id_mask                   = BIGSMP_APIC_ID_MASK,
 
        .cpu_mask_to_apicid             = cpu_mask_to_apicid,
        .cpu_mask_to_apicid_and         = cpu_mask_to_apicid_and,

diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index d51a3f0335aef822c909594aba74c361ac377d06..239af25615b131062864ed3955ac9c56cf88bef3 100644 (file)
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -73,7 +73,7 @@ struct genapic apic_default = {
 
        .get_apic_id                    = default_get_apic_id,
        .set_apic_id                    = NULL,
-       .apic_id_mask                   = APIC_ID_MASK,
+       .apic_id_mask                   = DEFAULT_APIC_ID_MASK,
 
        .cpu_mask_to_apicid             = cpu_mask_to_apicid,
        .cpu_mask_to_apicid_and         = cpu_mask_to_apicid_and,

diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 1944675db629daffbf4e853eb5fac66e3035c639..21fb33eea91bc75a816a9cc18a0a2cab4dd76d2a 100644 (file)
--- a/arch/x86/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
@@ -128,7 +128,7 @@ struct genapic apic_es7000 = {
 
        .get_apic_id                    = es7000_get_apic_id,
        .set_apic_id                    = NULL,
-       .apic_id_mask                   = APIC_ID_MASK,
+       .apic_id_mask                   = ES7000_APIC_ID_MASK,
 
        .cpu_mask_to_apicid             = cpu_mask_to_apicid,
        .cpu_mask_to_apicid_and         = cpu_mask_to_apicid_and,

diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c
index fcbba84c090f72be5bb0c67191abc27031fb79b1..27d2d1f2d6f042a9a5659aeee57680cb9df79222 100644 (file)
--- a/arch/x86/mach-generic/numaq.c
+++ b/arch/x86/mach-generic/numaq.c
@@ -92,7 +92,7 @@ struct genapic apic_numaq = {
 
        .get_apic_id                    = numaq_get_apic_id,
        .set_apic_id                    = NULL,
-       .apic_id_mask                   = APIC_ID_MASK,
+       .apic_id_mask                   = NUMAQ_APIC_ID_MASK,
 
        .cpu_mask_to_apicid             = cpu_mask_to_apicid,
        .cpu_mask_to_apicid_and         = cpu_mask_to_apicid_and,

diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 5650eaf9061f213f53e30cbe62e008be181e38db..f24cba1b29dac82b18a2925f999a1dd25c685d00 100644 (file)
--- a/arch/x86/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
@@ -72,7 +72,7 @@ struct genapic apic_summit = {
 
        .get_apic_id                    = summit_get_apic_id,
        .set_apic_id                    = NULL,
-       .apic_id_mask                   = APIC_ID_MASK,
+       .apic_id_mask                   = SUMMIT_APIC_ID_MASK,
 
        .cpu_mask_to_apicid             = cpu_mask_to_apicid,
        .cpu_mask_to_apicid_and         = cpu_mask_to_apicid_and,