diff options
| author | Ingo Molnar | 2009-04-08 12:31:26 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2009-05-28 18:24:11 +0200 |
| commit | 711c2e481c9d1113650d09de10f61ee88ab56fda (patch) | |
| tree | fec0cad6aa5f8c0884c04049e8071ff86165bab9 /arch/x86/kernel/cpu/mcheck/mce_64.c | |
| parent | x86, mce: unify, prepare codes (diff) | |
| download | kernel-qcow2-linux-711c2e481c9d1113650d09de10f61ee88ab56fda.tar.gz kernel-qcow2-linux-711c2e481c9d1113650d09de10f61ee88ab56fda.tar.xz kernel-qcow2-linux-711c2e481c9d1113650d09de10f61ee88ab56fda.zip | |
x86, mce: unify, prepare for 32-bit v2
Prepare the 64-bit mce_64.c code side to be built on 32-bit.
[ includes ifdef relocation by Andi Kleen ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@firstfloor.org>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce_64.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_64.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index ce48ae75e1dc..2e2c3d2e9586 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -37,6 +37,10 @@ #include <asm/msr.h> #include <asm/smp.h> +#include "mce.h" + +#ifdef CONFIG_X86_64 + #define MISC_MCELOG_MINOR 227 atomic_t mce_entry; @@ -1241,7 +1245,7 @@ static __init int mce_init_device(void) device_initcall(mce_init_device); -#ifdef CONFIG_X86_32 +#else /* CONFIG_X86_32: */ int mce_disabled; |