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/kernel/cpu | |
| 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/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/addon_cpuid_features.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/intel.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index e8bb892c09fd..4a48bb409748 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <asm/pat.h> | 7 | #include <asm/pat.h> |
| 8 | #include <asm/processor.h> | 8 | #include <asm/processor.h> |
| 9 | 9 | ||
| 10 | #include <mach_apic.h> | 10 | #include <asm/genapic.h> |
| 11 | 11 | ||
| 12 | struct cpuid_bit { | 12 | struct cpuid_bit { |
| 13 | u16 feature; | 13 | u16 feature; |
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 7c878f6aa919..ff4d7b9e32e4 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | # include <asm/cacheflush.h> | 12 | # include <asm/cacheflush.h> |
| 13 | #endif | 13 | #endif |
| 14 | 14 | ||
| 15 | #include <mach_apic.h> | 15 | #include <asm/genapic.h> |
| 16 | 16 | ||
| 17 | #include "cpu.h" | 17 | #include "cpu.h" |
| 18 | 18 | ||
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 055b9c3a6600..c4bdc7f00207 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #ifdef CONFIG_X86_LOCAL_APIC | 26 | #ifdef CONFIG_X86_LOCAL_APIC |
| 27 | #include <asm/mpspec.h> | 27 | #include <asm/mpspec.h> |
| 28 | #include <asm/apic.h> | 28 | #include <asm/apic.h> |
| 29 | #include <mach_apic.h> | 29 | #include <asm/genapic.h> |
| 30 | #include <asm/genapic.h> | 30 | #include <asm/genapic.h> |
| 31 | #include <asm/uv/uv.h> | 31 | #include <asm/uv/uv.h> |
| 32 | #endif | 32 | #endif |
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 5deefae9064d..1cef0aa5e5dc 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #ifdef CONFIG_X86_LOCAL_APIC | 24 | #ifdef CONFIG_X86_LOCAL_APIC |
| 25 | #include <asm/mpspec.h> | 25 | #include <asm/mpspec.h> |
| 26 | #include <asm/apic.h> | 26 | #include <asm/apic.h> |
| 27 | #include <mach_apic.h> | 27 | #include <asm/genapic.h> |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | 30 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) |