diff options
| author | Yinghai Lu | 2008-09-10 01:40:37 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-09-10 08:21:05 +0200 |
| commit | 879d792b66d633bbe466974f61d1acc9aa8c78eb (patch) | |
| tree | 4e1367fcde52da73daa6558606ce34aa39547e9d /include/asm-x86/bugs.h | |
| parent | x86: make intel_64.c the same as intel.c (diff) | |
| download | kernel-qcow2-linux-879d792b66d633bbe466974f61d1acc9aa8c78eb.tar.gz kernel-qcow2-linux-879d792b66d633bbe466974f61d1acc9aa8c78eb.tar.xz kernel-qcow2-linux-879d792b66d633bbe466974f61d1acc9aa8c78eb.zip | |
x86: let intel 64-bit use intel.c
now that arch/x86/kernel/cpu/intel_64.c and
arch/x86/kernel/cpu/intel.c are equal, drop
arch/x86/kernel/cpu/intel_64.c and fix up
the glue.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/bugs.h')
| -rw-r--r-- | include/asm-x86/bugs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/bugs.h b/include/asm-x86/bugs.h index ae514c76a96f..dc604985f2ad 100644 --- a/include/asm-x86/bugs.h +++ b/include/asm-x86/bugs.h @@ -3,7 +3,7 @@ extern void check_bugs(void); -#ifdef CONFIG_CPU_SUP_INTEL_32 +#if defined(CONFIG_CPU_SUP_INTEL) && defined(CONFIG_X86_32) int ppro_with_ram_bug(void); #else static inline int ppro_with_ram_bug(void) { return 0; } |