From 7dbcffec77620f0ab5221acbef0aa875c0919194 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 30 Jan 2008 13:30:17 +0100
Subject: [PATCH] --- yaml --- r: 79749 b: refs/heads/master c:
 af7a78e9258ffcca681e080cbc857f854869144f h: refs/heads/master i:   79747:
 5722a91ff121599f6e6b7ef2f58fa233c6a4a093 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kernel/setup_64.c |  1 +
 trunk/include/asm-x86/mce.h      | 14 +++++++-------
 trunk/include/asm-x86/proto.h    |  1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 078a7eb0b2de..3c606574a595 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 718fc13b4675470ea191522ef98b02a55d990fa1
+refs/heads/master: af7a78e9258ffcca681e080cbc857f854869144f
diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c
index 0e2bffe2e203..a84a4efc7fe6 100644
--- a/trunk/arch/x86/kernel/setup_64.c
+++ b/trunk/arch/x86/kernel/setup_64.c
@@ -59,6 +59,7 @@
 #include <asm/sections.h>
 #include <asm/dmi.h>
 #include <asm/cacheflush.h>
+#include <asm/mce.h>
 
 /*
  * Machine setup..
diff --git a/trunk/include/asm-x86/mce.h b/trunk/include/asm-x86/mce.h
index df304fd89c27..e6ff507a73b0 100644
--- a/trunk/include/asm-x86/mce.h
+++ b/trunk/include/asm-x86/mce.h
@@ -85,14 +85,7 @@ struct mce_log {
 #ifdef __KERNEL__
 
 #ifdef CONFIG_X86_32
-#ifdef CONFIG_X86_MCE
-extern void mcheck_init(struct cpuinfo_x86 *c);
-#else
-#define mcheck_init(c) do {} while(0)
-#endif
-
 extern int mce_disabled;
-
 #else /* CONFIG_X86_32 */
 
 #include <asm/atomic.h>
@@ -121,6 +114,13 @@ extern int mce_notify_user(void);
 
 #endif /* !CONFIG_X86_32 */
 
+
+
+#ifdef CONFIG_X86_MCE
+extern void mcheck_init(struct cpuinfo_x86 *c);
+#else
+#define mcheck_init(c) do { } while (0)
+#endif
 extern void stop_mce(void);
 extern void restart_mce(void);
 
diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h
index b10cd1b82089..02420dea73c6 100644
--- a/trunk/include/asm-x86/proto.h
+++ b/trunk/include/asm-x86/proto.h
@@ -13,7 +13,6 @@ extern void pda_init(int);
 
 extern void early_idt_handler(void);
 
-extern void mcheck_init(struct cpuinfo_x86 *c);
 extern void init_memory_mapping(unsigned long start, unsigned long end);
 
 extern void system_call(void);