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