diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-24 02:01:52 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:53:02 +0200 |
| commit | 773763df7de881e65ff2600c024c9ce2dde64750 (patch) | |
| tree | eb3cfea21779d3e9676e8010029c95c2608b46ad /arch/x86/kernel | |
| 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')
| -rw-r--r-- | arch/x86/kernel/apic_32.c | 8 | ||||
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 7 |
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 1103e05aa1b..0ec8321e687 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -23,11 +23,13 @@ #include <linux/mc146818rtc.h> #include <linux/kernel_stat.h> #include <linux/sysdev.h> +#include <linux/ioport.h> #include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/acpi_pmtmr.h> #include <linux/module.h> #include <linux/dmi.h> +#include <linux/dmar.h> #include <asm/atomic.h> #include <asm/smp.h> @@ -36,8 +38,14 @@ #include <asm/desc.h> #include <asm/arch_hooks.h> #include <asm/hpet.h> +#include <asm/pgalloc.h> #include <asm/i8253.h> #include <asm/nmi.h> +#include <asm/idle.h> +#include <asm/proto.h> +#include <asm/timex.h> +#include <asm/apic.h> +#include <asm/i8259.h> #include <mach_apic.h> #include <mach_apicdef.h> diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index b7268f5c8b1..ebe417b4d7f 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -24,9 +24,11 @@ #include <linux/kernel_stat.h> #include <linux/sysdev.h> #include <linux/ioport.h> +#include <linux/cpu.h> #include <linux/clockchips.h> #include <linux/acpi_pmtmr.h> #include <linux/module.h> +#include <linux/dmi.h> #include <linux/dmar.h> #include <asm/atomic.h> @@ -34,8 +36,10 @@ #include <asm/mtrr.h> #include <asm/mpspec.h> #include <asm/desc.h> +#include <asm/arch_hooks.h> #include <asm/hpet.h> #include <asm/pgalloc.h> +#include <asm/i8253.h> #include <asm/nmi.h> #include <asm/idle.h> #include <asm/proto.h> @@ -43,8 +47,9 @@ #include <asm/apic.h> #include <asm/i8259.h> -#include <mach_ipi.h> #include <mach_apic.h> +#include <mach_apicdef.h> +#include <mach_ipi.h> /* * Sanity check |