---

yaml --- r: 28983 b: refs/heads/master c: a03a3e2 h: refs/heads/master i: 28981: ba074b9 28979: 2338cee 28975: 252ef28 v: v3
git-mirror · Jun 23, 2006 · 4129616 · 4129616
1 parent f58616e
commit 4129616
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 */