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>

5 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 9eca977227c4..1f4ad4f77022 100644
--- 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 d51a3f0335ae..239af25615b1 100644
--- 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 1944675db629..21fb33eea91b 100644
--- 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 fcbba84c090f..27d2d1f2d6f0 100644
--- 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 5650eaf9061f..f24cba1b29da 100644
--- 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,