diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-19 23:50:38 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:52:54 -0400 |
commit | d4057bdb6a3bb85dd44f9f39f41eac53696fd637 (patch) | |
tree | 7f9bb5e8dc27fbe6d3c4b10ccee301aef5250c59 /arch/x86/kernel/io_apic_32.c | |
parent | e955b5398b660a204854bdff059d050b44090879 (diff) |
x86: make headers files the same in io_apic_xx.c
also make no_timer_check to be global on 64 bit, because vmi_32 is using that.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/io_apic_32.c')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 3010bdd3352d..48184e126f2c 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -25,28 +25,37 @@ | |||
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
28 | #include <linux/bootmem.h> | 28 | #include <linux/pci.h> |
29 | #include <linux/mc146818rtc.h> | 29 | #include <linux/mc146818rtc.h> |
30 | #include <linux/compiler.h> | 30 | #include <linux/compiler.h> |
31 | #include <linux/acpi.h> | 31 | #include <linux/acpi.h> |
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include <linux/sysdev.h> | 33 | #include <linux/sysdev.h> |
34 | #include <linux/pci.h> | ||
35 | #include <linux/msi.h> | 34 | #include <linux/msi.h> |
36 | #include <linux/htirq.h> | 35 | #include <linux/htirq.h> |
37 | #include <linux/freezer.h> | 36 | #include <linux/freezer.h> |
38 | #include <linux/kthread.h> | 37 | #include <linux/kthread.h> |
39 | #include <linux/jiffies.h> /* time_after() */ | 38 | #include <linux/jiffies.h> /* time_after() */ |
39 | #ifdef CONFIG_ACPI | ||
40 | #include <acpi/acpi_bus.h> | ||
41 | #endif | ||
42 | #include <linux/bootmem.h> | ||
43 | #include <linux/dmar.h> | ||
40 | 44 | ||
45 | #include <asm/idle.h> | ||
41 | #include <asm/io.h> | 46 | #include <asm/io.h> |
42 | #include <asm/smp.h> | 47 | #include <asm/smp.h> |
43 | #include <asm/desc.h> | 48 | #include <asm/desc.h> |
49 | #include <asm/proto.h> | ||
50 | #include <asm/acpi.h> | ||
51 | #include <asm/dma.h> | ||
44 | #include <asm/timer.h> | 52 | #include <asm/timer.h> |
45 | #include <asm/i8259.h> | 53 | #include <asm/i8259.h> |
46 | #include <asm/nmi.h> | 54 | #include <asm/nmi.h> |
47 | #include <asm/msidef.h> | 55 | #include <asm/msidef.h> |
48 | #include <asm/hypertransport.h> | 56 | #include <asm/hypertransport.h> |
49 | #include <asm/setup.h> | 57 | #include <asm/setup.h> |
58 | #include <asm/irq_remapping.h> | ||
50 | 59 | ||
51 | #include <mach_ipi.h> | 60 | #include <mach_ipi.h> |
52 | #include <mach_apic.h> | 61 | #include <mach_apic.h> |