diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 19:28:56 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 19:41:30 +0400 |
| commit | 5af5573ee06c361378e22a9dd71dae0320e841f7 (patch) | |
| tree | af9b79f408455b66c61b6a0ed6ccffa60811534a /arch/x86 | |
| parent | 8346ea17aa20e9864b0f7dc03d55f3cd5620b8c1 (diff) | |
| download | linux-5af5573ee06c361378e22a9dd71dae0320e841f7.tar.xz | |
x86: move ipi definitions to mach_ipi.h
take them out of the x86_64-only asm/mach_apic.h
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/crash.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/io_apic_64.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/smp.c | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/tlb_64.c | 3 |
5 files changed, 7 insertions, 10 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 5362cfd30ecd..206278f1c6f4 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -41,6 +41,8 @@ #include <asm/timex.h> #include <asm/apic.h> +#include <mach_ipi.h> + int disable_apic_timer __cpuinitdata; static int apic_calibrate_pmtmr __initdata; int disable_apic; diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 9a5fa0abfcc7..2251d0ae9570 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -26,11 +26,7 @@ #include <linux/kdebug.h> #include <asm/smp.h> -#ifdef CONFIG_X86_32 #include <mach_ipi.h> -#else -#include <asm/mach_apic.h> -#endif /* This keeps a track of which one is crashing cpu. */ static int crashing_cpu; diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 1627c0d53e0b..7d5cdf320eba 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c @@ -50,6 +50,8 @@ #include <asm/msidef.h> #include <asm/hypertransport.h> +#include <mach_ipi.h> + struct irq_cfg { cpumask_t domain; cpumask_t old_domain; diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index 16c52aaaca35..8f75893a6467 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c @@ -26,12 +26,8 @@ #include <asm/tlbflush.h> #include <asm/mmu_context.h> #include <asm/proto.h> -#ifdef CONFIG_X86_32 -#include <mach_apic.h> #include <mach_ipi.h> -#else -#include <asm/mach_apic.h> -#endif +#include <mach_apic.h> /* * Some notes on x86 processor bugs affecting SMP operation: * diff --git a/arch/x86/kernel/tlb_64.c b/arch/x86/kernel/tlb_64.c index 615d84817758..1558e513757e 100644 --- a/arch/x86/kernel/tlb_64.c +++ b/arch/x86/kernel/tlb_64.c @@ -11,11 +11,12 @@ #include <asm/mtrr.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> -#include <asm/mach_apic.h> #include <asm/mmu_context.h> #include <asm/proto.h> #include <asm/apicdef.h> #include <asm/idle.h> + +#include <mach_ipi.h> /* * Smarter SMP flushing macros. * c/o Linus Torvalds. |