Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/kernel/setup_64.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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..

include/asm-x86/mce.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -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);

include/asm-x86/proto.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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);