UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Gleixner 2008-01-30 13:30:17 +01:00 committed by Ingo Molnar
parent 718fc13b46
commit af7a78e925
3 changed files with 8 additions and 8 deletions
arch/x86/kernel
setup_64.c
include/asm-x86
mce.hproto.h

1
arch/x86/kernel/setup_64.c
View File

@ -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..

14
include/asm-x86/mce.h
View File

@ -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);
#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);

1
include/asm-x86/proto.h
View File

@ -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);