diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-07-28 23:55:09 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-29 15:42:26 -0700 |
| commit | e3346fc48204d780f92527d06df8bf6f28d603ec (patch) | |
| tree | 9338e0a21192c02adcf7406f2f2fc55a76887c16 | |
| parent | 94699b04eddd4b247d871930431d6fa1a46c175e (diff) | |
| download | linux-e3346fc48204d780f92527d06df8bf6f28d603ec.tar.gz linux-e3346fc48204d780f92527d06df8bf6f28d603ec.tar.bz2 linux-e3346fc48204d780f92527d06df8bf6f28d603ec.zip | |
x86, mce: fix "mce" boot option handling for CONFIG_X86_NEW_MCE
"mce argument mce ignored. Please use /sys" message shouldn't
be printed when using "mce" boot option.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Reviewed-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 7bd19c7f5315..75919440a188 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1549,8 +1549,10 @@ static struct miscdevice mce_log_device = { */ static int __init mcheck_enable(char *str) { - if (*str == 0) + if (*str == 0) { enable_p5_mce(); + return 1; + } if (*str == '=') str++; if (!strcmp(str, "off")) |