[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>

diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index f2a2b0ac9a18464d4c88d8b216aa843a783843e3..44f2c5f2dda16a0b8adcb6d0170fd92951a7307e 100644 (file)
--- 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 63d25ca6306f81ff6ff5160a4b0941a056d7fa54..e6517915fe3e19ebc1a74cc7c34ac6be9eb616b9 100644 (file)
--- 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 (file)
index 0000000..7cc1a97
--- /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 5116465272ec3620883250b9efb7eeda586dcdc0..0c83cf12eec904499662d2b41379ed4e0288c373 100644 (file)
--- 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 */