aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 13:30:17 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:30:17 +0100
commitaf7a78e9258ffcca681e080cbc857f854869144f (patch)
tree7eacb730f4fa5ea9cdcec1b2ef0f6dd3d74099d4 /include
parent718fc13b4675470ea191522ef98b02a55d990fa1 (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/mce.h14
-rw-r--r--include/asm-x86/proto.h1
2 files changed, 7 insertions, 8 deletions
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);