diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-24 05:01:52 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:53:02 -0400 |
commit | 773763df7de881e65ff2600c024c9ce2dde64750 (patch) | |
tree | eb3cfea21779d3e9676e8010029c95c2608b46ad /arch/x86/kernel/apic_64.c | |
parent | be7a656fe131cba088912bcafb079b029320504d (diff) |
x86: merge header files in apic_xx.c
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r-- | arch/x86/kernel/apic_64.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index b7268f5c8b18..ebe417b4d7fc 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -24,9 +24,11 @@ | |||
24 | #include <linux/kernel_stat.h> | 24 | #include <linux/kernel_stat.h> |
25 | #include <linux/sysdev.h> | 25 | #include <linux/sysdev.h> |
26 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> |
27 | #include <linux/cpu.h> | ||
27 | #include <linux/clockchips.h> | 28 | #include <linux/clockchips.h> |
28 | #include <linux/acpi_pmtmr.h> | 29 | #include <linux/acpi_pmtmr.h> |
29 | #include <linux/module.h> | 30 | #include <linux/module.h> |
31 | #include <linux/dmi.h> | ||
30 | #include <linux/dmar.h> | 32 | #include <linux/dmar.h> |
31 | 33 | ||
32 | #include <asm/atomic.h> | 34 | #include <asm/atomic.h> |
@@ -34,8 +36,10 @@ | |||
34 | #include <asm/mtrr.h> | 36 | #include <asm/mtrr.h> |
35 | #include <asm/mpspec.h> | 37 | #include <asm/mpspec.h> |
36 | #include <asm/desc.h> | 38 | #include <asm/desc.h> |
39 | #include <asm/arch_hooks.h> | ||
37 | #include <asm/hpet.h> | 40 | #include <asm/hpet.h> |
38 | #include <asm/pgalloc.h> | 41 | #include <asm/pgalloc.h> |
42 | #include <asm/i8253.h> | ||
39 | #include <asm/nmi.h> | 43 | #include <asm/nmi.h> |
40 | #include <asm/idle.h> | 44 | #include <asm/idle.h> |
41 | #include <asm/proto.h> | 45 | #include <asm/proto.h> |
@@ -43,8 +47,9 @@ | |||
43 | #include <asm/apic.h> | 47 | #include <asm/apic.h> |
44 | #include <asm/i8259.h> | 48 | #include <asm/i8259.h> |
45 | 49 | ||
46 | #include <mach_ipi.h> | ||
47 | #include <mach_apic.h> | 50 | #include <mach_apic.h> |
51 | #include <mach_apicdef.h> | ||
52 | #include <mach_ipi.h> | ||
48 | 53 | ||
49 | /* | 54 | /* |
50 | * Sanity check | 55 | * Sanity check |