summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/apicdef.h
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 14:25:53 -0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:02 +0200
commitf6bc40290964b5fcb48c226ccafa4b7536d62663 (patch)
tree4b59929aaef9fa73a909b1700726074ef98a134e /include/asm-x86/apicdef.h
parent4370ee4d3b7772158174bf6f0bf08359c2ccf54b (diff)
x86: include mach_apic.h in smpboot_64.c and smpboot.c
After the inclusion, a lot of files needs fixing for conflicts, some of them in the headers themselves, to accomodate for both i386 and x86_64 versions. [ mingo@elte.hu: build fix ] Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/apicdef.h')
-rw-r--r--include/asm-x86/apicdef.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h
index b0c6b285c91..674a2280e21 100644
--- a/include/asm-x86/apicdef.h
+++ b/include/asm-x86/apicdef.h
@@ -12,12 +12,6 @@
#define APIC_ID 0x20
-#ifdef CONFIG_X86_64
-# define APIC_ID_MASK (0xFFu<<24)
-# define GET_APIC_ID(x) (((x)>>24)&0xFFu)
-# define SET_APIC_ID(x) (((x)<<24))
-#endif
-
#define APIC_LVR 0x30
#define APIC_LVR_MASK 0xFF00FF
#define GET_APIC_VERSION(x) ((x)&0xFFu)