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>

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/x86/include/asm/mach-default/mach_apicdef.h b/arch/x86/include/asm/mach-default/mach_apicdef.h
index e84d437ba2b2..8318d121ea66 100644
--- 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) 
 {