openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86, mce: Cleanup param parser 

- Fix the comment formatting.

- The error path does not return 0, and printk lacks level and "\n".

- Move __setup("nomce") next to mcheck_disable().

- Improve readability etc.

[ Impact: cleanup ]

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Acked-by: Andi Kleen <ak@linux.intel.com>
LKML-Reference: <49CB3F38.7090703@jp.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Hidetoshi Seto 2009-03-26 17:39:20 +09:00 committed by H. Peter Anvin
parent b5c42bc8db
commit 13503fa913
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/x86/kernel/cpu/mcheck/mce_64.c
View File

@ -839,25 +839,29 @@ static int __init mcheck_disable(char *str)
mce_dont_init = 1; mce_dont_init = 1;
return 1; return 1;
} }
__setup("nomce", mcheck_disable);
/* mce=off disables machine check. /*
mce=TOLERANCELEVEL (number, see above) * mce=off disables machine check
mce=bootlog Log MCEs from before booting. Disabled by default on AMD. * mce=TOLERANCELEVEL (number, see above)
mce=nobootlog Don't log MCEs from before booting. */ * mce=bootlog Log MCEs from before booting. Disabled by default on AMD.
* mce=nobootlog Don't log MCEs from before booting.
*/
static int __init mcheck_enable(char *str) static int __init mcheck_enable(char *str)
{ {
if (!strcmp(str, "off")) if (!strcmp(str, "off"))
mce_dont_init = 1; mce_dont_init = 1;
else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog")) else if (!strcmp(str, "bootlog") || !strcmp(str, "nobootlog"))
mce_bootlog = str[0] == 'b'; mce_bootlog = (str[0] == 'b');
else if (isdigit(str[0])) else if (isdigit(str[0]))
get_option(&str, &tolerant); get_option(&str, &tolerant);
else else {
printk("mce= argument %s ignored. Please use /sys", str); printk(KERN_INFO "mce= argument %s ignored. Please use /sys\n",
str);
return 0;
}
return 1; return 1;
} }
__setup("nomce", mcheck_disable);
__setup("mce=", mcheck_enable); __setup("mce=", mcheck_enable);
/* /*