From 41296163d64cacfba760b04612cce24f03ae4b4f Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 23 Jun 2006 02:04:20 -0700
Subject: [PATCH] --- yaml --- r: 28983 b: refs/heads/master c:
 a03a3e287b119c7bcbcff1d68f81864ce33b1ad2 h: refs/heads/master i:   28981:
 ba074b9e6c98e08a069c05fc89c87f487466a957   28979:
 2338ceeafabe1d95dff67f2091817c4b190033af   28975:
 252ef28f5b9f2294b7dc7530f6af8b7048a4ee02 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/i386/kernel/cpu/common.c | 1 +
 trunk/arch/i386/power/cpu.c         | 1 +
 trunk/include/asm-i386/mce.h        | 5 +++++
 trunk/include/asm-i386/processor.h  | 6 ------
 5 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 trunk/include/asm-i386/mce.h

diff --git a/[refs] b/[refs]
index 268f6f90b655..36b413997247 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b88d4f1d390a6a232938d27d551f24cf08a2c7e0
+refs/heads/master: a03a3e287b119c7bcbcff1d68f81864ce33b1ad2
diff --git a/trunk/arch/i386/kernel/cpu/common.c b/trunk/arch/i386/kernel/cpu/common.c
index f2a2b0ac9a18..44f2c5f2dda1 100644
--- a/trunk/arch/i386/kernel/cpu/common.c
+++ b/trunk/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/trunk/arch/i386/power/cpu.c b/trunk/arch/i386/power/cpu.c
index 63d25ca6306f..e6517915fe3e 100644
--- a/trunk/arch/i386/power/cpu.c
+++ b/trunk/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/trunk/include/asm-i386/mce.h b/trunk/include/asm-i386/mce.h
new file mode 100644
index 000000000000..7cc1a973bf00
--- /dev/null
+++ b/trunk/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/trunk/include/asm-i386/processor.h b/trunk/include/asm-i386/processor.h
index 5116465272ec..0c83cf12eec9 100644
--- a/trunk/include/asm-i386/processor.h
+++ b/trunk/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 */