diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-06-23 11:04:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 16:42:56 +0200 |
| commit | a03a3e287b119c7bcbcff1d68f81864ce33b1ad2 (patch) | |
| tree | 9a95f05e533835a57b56645190b60cdd16f134e2 | |
| parent | [PATCH] i386: break out of recursion in stackframe walk (diff) | |
| download | linux-a03a3e287b119c7bcbcff1d68f81864ce33b1ad2.tar.xz linux-a03a3e287b119c7bcbcff1d68f81864ce33b1ad2.zip | |
[PATCH] Don't trigger full rebuild via CONFIG_X86_MCE
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/cpu/common.c | 1 | ||||
| -rw-r--r-- | arch/i386/power/cpu.c | 1 | ||||
| -rw-r--r-- | include/asm-i386/mce.h | 5 | ||||
| -rw-r--r-- | include/asm-i386/processor.h | 6 |
4 files changed, 7 insertions, 6 deletions
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c index f2a2b0ac9a18..44f2c5f2dda1 100644 --- a/arch/i386/kernel/cpu/common.c +++ b/arch/i386/kernel/cpu/common.c @@ -12,6 +12,7 @@ #include <asm/io.h> #include <asm/mmu_context.h> #include <asm/mtrr.h> +#include <asm/mce.h> #ifdef CONFIG_X86_LOCAL_APIC #include <asm/mpspec.h> #include <asm/apic.h> diff --git a/arch/i386/power/cpu.c b/arch/i386/power/cpu.c index 63d25ca6306f..e6517915fe3e 100644 --- a/arch/i386/power/cpu.c +++ b/arch/i386/power/cpu.c @@ -11,6 +11,7 @@ #include <linux/module.h> #include <linux/suspend.h> #include <asm/mtrr.h> +#include <asm/mce.h> static struct saved_context saved_context; diff --git a/include/asm-i386/mce.h b/include/asm-i386/mce.h new file mode 100644 index 000000000000..7cc1a973bf00 --- /dev/null +++ b/include/asm-i386/mce.h @@ -0,0 +1,5 @@ +#ifdef CONFIG_X86_MCE +extern void mcheck_init(struct cpuinfo_x86 *c); +#else +#define mcheck_init(c) do {} while(0) +#endif diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index 5116465272ec..0c83cf12eec9 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h @@ -728,10 +728,4 @@ extern unsigned long boot_option_idle_override; extern void enable_sep_cpu(void); extern int sysenter_setup(void); -#ifdef CONFIG_X86_MCE -extern void mcheck_init(struct cpuinfo_x86 *c); -#else -#define mcheck_init(c) do {} while(0) -#endif - #endif /* __ASM_I386_PROCESSOR_H */ |