x86, apic: get rid of *_APIC_ID_MASK definitions

Impact: cleanup

Remove the *_APIC_ID_MASK subarch definitions and move them straight
to the genapic driver initialization code.

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 6e587818c7ed6a19b09e699be669e55b6851a297..e58dee847573971fc5df95a1ffe080199a79788b 100644 (file)
--- a/arch/x86/include/asm/bigsmp/apicdef.h
+++ b/arch/x86/include/asm/bigsmp/apicdef.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_MACH_APICDEF_H
 #define __ASM_MACH_APICDEF_H
 
-#define                BIGSMP_APIC_ID_MASK             (0xFF<<24)
-
 static inline unsigned bigsmp_get_apic_id(unsigned long x)
 {
        return (x >> 24) & 0xFF;

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

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

diff --git a/arch/x86/include/asm/numaq/apicdef.h b/arch/x86/include/asm/numaq/apicdef.h
index 6f2cc5df0b15e9bc565cb44c12d07cefc5e98bac..cd927d5bd505461b8ee64a8fa750ee0e94a6cbc9 100644 (file)
--- a/arch/x86/include/asm/numaq/apicdef.h
+++ b/arch/x86/include/asm/numaq/apicdef.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_NUMAQ_APICDEF_H
 #define __ASM_NUMAQ_APICDEF_H
 
-#define NUMAQ_APIC_ID_MASK (0xF<<24)
-
 static inline unsigned int numaq_get_apic_id(unsigned long x)
 {
        return (x >> 24) & 0x0F;

diff --git a/arch/x86/include/asm/summit/apicdef.h b/arch/x86/include/asm/summit/apicdef.h
index 0373f0c7b5dbef42057ebf8ee15db48f88a47d44..c24b0df2dec61d55826938a2670883de8bddd397 100644 (file)
--- a/arch/x86/include/asm/summit/apicdef.h
+++ b/arch/x86/include/asm/summit/apicdef.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_SUMMIT_APICDEF_H
 #define __ASM_SUMMIT_APICDEF_H
 
-#define                SUMMIT_APIC_ID_MASK             (0xFF<<24)
-
 static inline unsigned summit_get_apic_id(unsigned long x)
 {
        return (x >> 24) & 0xFF;

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 1f4ad4f77022fad67f5b9d1f033dcc0e1aaccbd9..ee52c59aa3a4b31d385127bd935b7275e64736b5 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                   = BIGSMP_APIC_ID_MASK,
+       .apic_id_mask                   = 0xFF << 24,
 
        .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 239af25615b131062864ed3955ac9c56cf88bef3..e4ed7e6d62634085929040755a0a347dcf0418b4 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                   = DEFAULT_APIC_ID_MASK,
+       .apic_id_mask                   = 0x0F << 24,
 
        .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 21fb33eea91bc75a816a9cc18a0a2cab4dd76d2a..3d046dec0c9a5ecbcb20f58d7f13558d233523f2 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                   = ES7000_APIC_ID_MASK,
+       .apic_id_mask                   = 0xFF << 24,
 
        .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 27d2d1f2d6f042a9a5659aeee57680cb9df79222..a7bf1aa02e1a6705f868529e26ab0238554f63a8 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                   = NUMAQ_APIC_ID_MASK,
+       .apic_id_mask                   = 0x0F << 24,
 
        .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 f24cba1b29dac82b18a2925f999a1dd25c685d00..a0ae6b910488de42f79b32a961c4e52dd208c8d5 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                   = SUMMIT_APIC_ID_MASK,
+       .apic_id_mask                   = 0xFF << 24,
 
        .cpu_mask_to_apicid             = cpu_mask_to_apicid,
        .cpu_mask_to_apicid_and         = cpu_mask_to_apicid_and,