diff options
author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2009-06-15 04:22:49 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-06-16 19:56:07 -0400 |
commit | c697836985e18d9c34897428ba563b13044a6dcd (patch) | |
tree | baf61b41254ff78b039cb5405422c0dbdaa6a240 /arch/x86/kernel/cpu/mcheck/mce.c | |
parent | 9e55e44e39798541ba39d57f4b569deb555ae1ce (diff) |
x86, mce: make mce_disabled boolean
The mce_disabled on 32bit is a tristate variable [1,0,-1],
while 64bit version is boolean [0,1].
This patch makes mce_disabled always boolean, and use mce_p5_enabled
to indicate the third state instead.
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.c')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index faedd776847d..6095e0296abd 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -1286,8 +1286,7 @@ static void __cpuinit mce_ancient_init(struct cpuinfo_x86 *c) | |||
1286 | return; | 1286 | return; |
1287 | switch (c->x86_vendor) { | 1287 | switch (c->x86_vendor) { |
1288 | case X86_VENDOR_INTEL: | 1288 | case X86_VENDOR_INTEL: |
1289 | if (mce_p5_enabled()) | 1289 | intel_p5_mcheck_init(c); |
1290 | intel_p5_mcheck_init(c); | ||
1291 | break; | 1290 | break; |
1292 | case X86_VENDOR_CENTAUR: | 1291 | case X86_VENDOR_CENTAUR: |
1293 | winchip_mcheck_init(c); | 1292 | winchip_mcheck_init(c); |
@@ -2002,7 +2001,7 @@ EXPORT_SYMBOL_GPL(nr_mce_banks); /* non-fatal.o */ | |||
2002 | /* This has to be run for each processor */ | 2001 | /* This has to be run for each processor */ |
2003 | void mcheck_init(struct cpuinfo_x86 *c) | 2002 | void mcheck_init(struct cpuinfo_x86 *c) |
2004 | { | 2003 | { |
2005 | if (mce_disabled == 1) | 2004 | if (mce_disabled) |
2006 | return; | 2005 | return; |
2007 | 2006 | ||
2008 | switch (c->x86_vendor) { | 2007 | switch (c->x86_vendor) { |
@@ -2032,10 +2031,9 @@ void mcheck_init(struct cpuinfo_x86 *c) | |||
2032 | 2031 | ||
2033 | static int __init mcheck_enable(char *str) | 2032 | static int __init mcheck_enable(char *str) |
2034 | { | 2033 | { |
2035 | mce_disabled = -1; | 2034 | mce_p5_enabled = 1; |
2036 | return 1; | 2035 | return 1; |
2037 | } | 2036 | } |
2038 | |||
2039 | __setup("mce", mcheck_enable); | 2037 | __setup("mce", mcheck_enable); |
2040 | 2038 | ||
2041 | #endif /* CONFIG_X86_OLD_MCE */ | 2039 | #endif /* CONFIG_X86_OLD_MCE */ |