Commit af7a78e9 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 718fc13b
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/dmi.h> #include <asm/dmi.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/mce.h>
/* /*
* Machine setup.. * Machine setup..
......
...@@ -85,14 +85,7 @@ struct mce_log { ...@@ -85,14 +85,7 @@ struct mce_log {
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_X86_32 #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; extern int mce_disabled;
#else /* CONFIG_X86_32 */ #else /* CONFIG_X86_32 */
#include <asm/atomic.h> #include <asm/atomic.h>
...@@ -121,6 +114,13 @@ extern int mce_notify_user(void); ...@@ -121,6 +114,13 @@ extern int mce_notify_user(void);
#endif /* !CONFIG_X86_32 */ #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 stop_mce(void);
extern void restart_mce(void); extern void restart_mce(void);
......
...@@ -13,7 +13,6 @@ extern void pda_init(int); ...@@ -13,7 +13,6 @@ extern void pda_init(int);
extern void early_idt_handler(void); 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 init_memory_mapping(unsigned long start, unsigned long end);
extern void system_call(void); extern void system_call(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment