From 270ee96fb1140680523fb39a639d7d8637fd3e83 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 8 Apr 2009 12:31:26 +0200 Subject: [PATCH] --- yaml --- r: 148871 b: refs/heads/master c: 711c2e481c9d1113650d09de10f61ee88ab56fda h: refs/heads/master i: 148869: e5df9cc224549fcc02356a7d90aa6eb3b06594a6 148867: 7d0a28f390874f7926f84e2f814df73d26753c76 148863: b17331045770b3bb09955f2fe60cc70aebed9b74 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce.h | 4 ++-- trunk/arch/x86/kernel/cpu/mcheck/mce_64.c | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 86d2a380563c..4fbe2cef3354 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a988d334ae8213c0e0e62327222f6e5e6e52bcf1 +refs/heads/master: 711c2e481c9d1113650d09de10f61ee88ab56fda diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.h b/trunk/arch/x86/kernel/cpu/mcheck/mce.h index 2d1a54bdadfc..cd6cffcc2de0 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/mce.h +++ b/trunk/arch/x86/kernel/cpu/mcheck/mce.h @@ -1,14 +1,14 @@ #include #include -#ifdef CONFIG_X86_32 - void amd_mcheck_init(struct cpuinfo_x86 *c); void intel_p4_mcheck_init(struct cpuinfo_x86 *c); void intel_p5_mcheck_init(struct cpuinfo_x86 *c); void intel_p6_mcheck_init(struct cpuinfo_x86 *c); void winchip_mcheck_init(struct cpuinfo_x86 *c); +#ifdef CONFIG_X86_32 + /* Call the installed machine check handler for this CPU setup. */ extern void (*machine_check_vector)(struct pt_regs *, long error_code); diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c index ce48ae75e1dc..2e2c3d2e9586 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -37,6 +37,10 @@ #include #include +#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;