diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 11:55:37 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 08:16:42 -0500 |
commit | 1dcdd3d15ecea0c22a09d4d001a39d425fceff2c (patch) | |
tree | 91419ae421b2d1cac6297c9671eac2ff7723d7c2 /arch/x86/include/asm/apic.h | |
parent | 7c20dcc545d78946e40e8fab99637fe815b1d211 (diff) |
x86: remove mach_apic.h
Spread mach_apic.h definitions into genapic.h. (with some knock-on effects
on smp.h and apic.h.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r-- | arch/x86/include/asm/apic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 3a3202074c63..6a77068e261a 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -215,7 +215,7 @@ static inline void disable_local_APIC(void) { } | |||
215 | #define SET_APIC_ID(x) (apic->set_apic_id(x)) | 215 | #define SET_APIC_ID(x) (apic->set_apic_id(x)) |
216 | #else | 216 | #else |
217 | 217 | ||
218 | static inline unsigned default_get_apic_id(unsigned long x) | 218 | static inline unsigned default_get_apic_id(unsigned long x) |
219 | { | 219 | { |
220 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); | 220 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); |
221 | 221 | ||