diff options
Diffstat (limited to 'include/asm-x86/mach-default/mach_apicdef.h')
-rw-r--r-- | include/asm-x86/mach-default/mach_apicdef.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/asm-x86/mach-default/mach_apicdef.h b/include/asm-x86/mach-default/mach_apicdef.h index ae9841319094..e4b29ba37de6 100644 --- a/include/asm-x86/mach-default/mach_apicdef.h +++ b/include/asm-x86/mach-default/mach_apicdef.h | |||
@@ -3,10 +3,14 @@ | |||
3 | 3 | ||
4 | #include <asm/apic.h> | 4 | #include <asm/apic.h> |
5 | 5 | ||
6 | #ifdef CONFIG_X86_64 | ||
7 | #define APIC_ID_MASK (0xFFu<<24) | ||
8 | #define GET_APIC_ID(x) (((x)>>24)&0xFFu) | ||
9 | #define SET_APIC_ID(x) (((x)<<24)) | ||
10 | #else | ||
6 | #define APIC_ID_MASK (0xF<<24) | 11 | #define APIC_ID_MASK (0xF<<24) |
7 | |||
8 | static inline unsigned get_apic_id(unsigned long x) | 12 | static inline unsigned get_apic_id(unsigned long x) |
9 | { | 13 | { |
10 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); | 14 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); |
11 | if (APIC_XAPIC(ver)) | 15 | if (APIC_XAPIC(ver)) |
12 | return (((x)>>24)&0xFF); | 16 | return (((x)>>24)&0xFF); |
@@ -15,5 +19,6 @@ static inline unsigned get_apic_id(unsigned long x) | |||
15 | } | 19 | } |
16 | 20 | ||
17 | #define GET_APIC_ID(x) get_apic_id(x) | 21 | #define GET_APIC_ID(x) get_apic_id(x) |
22 | #endif | ||
18 | 23 | ||
19 | #endif | 24 | #endif |