diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:36:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:20:36 +0100 |
| commit | 1f75ed0c1311a50ed393bcac258de65680d360e5 (patch) | |
| tree | a01ba549ce874af2167543aa91769bfedd508220 /arch/x86/include/asm/mach-default | |
| parent | x86: remove mach_mpspec.h (diff) | |
| download | linux-dev-1f75ed0c1311a50ed393bcac258de65680d360e5.tar.xz linux-dev-1f75ed0c1311a50ed393bcac258de65680d360e5.zip | |
x86: remove mach_apicdef.h
Move its definitions into apic.h.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 2e4104cf3481..b60b767d5be0 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 @@ #ifdef CONFIG_X86_LOCAL_APIC -#include <mach_apicdef.h> #include <asm/smp.h> #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 5141085962d3..000000000000 --- a/arch/x86/include/asm/mach-default/mach_apicdef.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H -#define _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H - -#include <asm/apic.h> - -#ifdef CONFIG_X86_64 -#define SET_APIC_ID(x) (apic->set_apic_id(x)) -#else - -static inline unsigned default_get_apic_id(unsigned long x) -{ - unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); - - if (APIC_XAPIC(ver)) - return (x >> 24) & 0xFF; - else - return (x >> 24) & 0x0F; -} - -#endif - -#endif /* _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H */ |