diff options
Diffstat (limited to 'arch/x86/include/asm/mach-default')
-rw-r--r-- | arch/x86/include/asm/mach-default/mach_apic.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/mach-default/mach_apicdef.h | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h index 2e4104cf348..b60b767d5be 100644 --- a/arch/x86/include/asm/mach-default/mach_apic.h +++ b/arch/x86/include/asm/mach-default/mach_apic.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #ifdef CONFIG_X86_LOCAL_APIC | 4 | #ifdef CONFIG_X86_LOCAL_APIC |
5 | 5 | ||
6 | #include <mach_apicdef.h> | ||
7 | #include <asm/smp.h> | 6 | #include <asm/smp.h> |
8 | 7 | ||
9 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | 8 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) |
diff --git a/arch/x86/include/asm/mach-default/mach_apicdef.h b/arch/x86/include/asm/mach-default/mach_apicdef.h deleted file mode 100644 index 5141085962d..00000000000 --- a/arch/x86/include/asm/mach-default/mach_apicdef.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H | ||
2 | #define _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H | ||
3 | |||
4 | #include <asm/apic.h> | ||
5 | |||
6 | #ifdef CONFIG_X86_64 | ||
7 | #define SET_APIC_ID(x) (apic->set_apic_id(x)) | ||
8 | #else | ||
9 | |||
10 | static inline unsigned default_get_apic_id(unsigned long x) | ||
11 | { | ||
12 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); | ||
13 | |||
14 | if (APIC_XAPIC(ver)) | ||
15 | return (x >> 24) & 0xFF; | ||
16 | else | ||
17 | return (x >> 24) & 0x0F; | ||
18 | } | ||
19 | |||
20 | #endif | ||
21 | |||
22 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H */ | ||