diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2007-02-13 13:26:26 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-02-13 13:26:26 +0100 |
| commit | 105fddb862d3da2f414329ff7719794fb2bd706b (patch) | |
| tree | 84deffa423e9dfdeb5af22627b4db190f285093a | |
| parent | 992af68147299bb635be97f789e4f66ba7add477 (diff) | |
| download | talos-op-linux-105fddb862d3da2f414329ff7719794fb2bd706b.tar.gz talos-op-linux-105fddb862d3da2f414329ff7719794fb2bd706b.zip | |
[PATCH] i386: Move mce_disabled to asm/mce.h
Allows external actors to disable mce.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andi Kleen <ak@suse.de>
===================================================================
| -rw-r--r-- | arch/i386/kernel/cpu/mcheck/mce.h | 2 | ||||
| -rw-r--r-- | include/asm-i386/mce.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/mcheck/mce.h b/arch/i386/kernel/cpu/mcheck/mce.h index 84fd4cf7d0fb..81fb6e2d35f3 100644 --- a/arch/i386/kernel/cpu/mcheck/mce.h +++ b/arch/i386/kernel/cpu/mcheck/mce.h @@ -1,4 +1,5 @@ #include <linux/init.h> +#include <asm/mce.h> void amd_mcheck_init(struct cpuinfo_x86 *c); void intel_p4_mcheck_init(struct cpuinfo_x86 *c); @@ -9,6 +10,5 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c); /* Call the installed machine check handler for this CPU setup. */ extern fastcall void (*machine_check_vector)(struct pt_regs *, long error_code); -extern int mce_disabled; extern int nr_mce_banks; diff --git a/include/asm-i386/mce.h b/include/asm-i386/mce.h index 7cc1a973bf00..b0a02ee34ffd 100644 --- a/include/asm-i386/mce.h +++ b/include/asm-i386/mce.h @@ -3,3 +3,5 @@ extern void mcheck_init(struct cpuinfo_x86 *c); #else #define mcheck_init(c) do {} while(0) #endif + +extern int mce_disabled; |
