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

x86, mce: move mce_disabled option into common 32bit/64bit code 

It's the same function, so let's share it.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Andi Kleen 2009-04-28 23:07:25 +02:00 committed by H. Peter Anvin
parent 04b2b1a4df
commit d7c3c9a609
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/x86/kernel/cpu/mcheck/mce.c
View File

@ -907,16 +907,6 @@ static struct miscdevice mce_log_device = {
&mce_chrdev_ops, &mce_chrdev_ops,
}; };
/*
* Old style boot options parsing. Only for compatibility.
*/
static int __init mcheck_disable(char *str)
{
mce_disabled = 1;
return 1;
}
__setup("nomce", mcheck_disable);
/* /*
* mce=off disables machine check * mce=off disables machine check
* mce=TOLERANCELEVEL (number, see above) * mce=TOLERANCELEVEL (number, see above)
@ -1327,19 +1317,22 @@ void mcheck_init(struct cpuinfo_x86 *c)
printk(KERN_INFO "mce: CPU supports %d MCE banks\n", nr_mce_banks); printk(KERN_INFO "mce: CPU supports %d MCE banks\n", nr_mce_banks);
} }
static int __init mcheck_disable(char *str)
{
mce_disabled = 1;
return 1;
}
static int __init mcheck_enable(char *str) static int __init mcheck_enable(char *str)
{ {
mce_disabled = -1; mce_disabled = -1;
return 1; return 1;
} }
__setup("nomce", mcheck_disable);
__setup("mce", mcheck_enable); __setup("mce", mcheck_enable);
#endif /* CONFIG_X86_32 */ #endif /* CONFIG_X86_OLD_MCE */
/*
* Old style boot options parsing. Only for compatibility.
*/
static int __init mcheck_disable(char *str)
{
mce_disabled = 1;
return 1;
}
__setup("nomce", mcheck_disable);