From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 30 Jan 2008 12:30:17 +0000 (+0100)
Subject: x86: move mce related declarations
X-Git-Tag: v2.6.25-rc1~1143^2~826
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af7a78e9258ffcca681e080cbc857f854869144f;p=linux-2.6-omap-h63xx.git

x86: move mce related declarations

Move the mce related declarations where they belong, fix the
users and remove 32bit dependency in mce.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 0e2bffe2e20..a84a4efc7fe 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/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/include/asm-x86/mce.h b/include/asm-x86/mce.h
index df304fd89c2..e6ff507a73b 100644
--- a/include/asm-x86/mce.h
+++ b/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/include/asm-x86/proto.h b/include/asm-x86/proto.h
index b10cd1b8208..02420dea73c 100644
--- a/include/asm-x86/proto.h
+++ b/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);