diff options
| author | Andi Kleen | 2009-04-28 23:07:25 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2009-05-28 18:24:12 +0200 |
| commit | d7c3c9a609563868d8a70e220399d06a25aba095 (patch) | |
| tree | 48e01aead3d492f4b4ec3d22c7e735f7742a6c62 /arch/x86/kernel/cpu/mcheck/mce.c | |
| parent | x86, mce: rename 64bit mce_dont_init to mce_disabled (diff) | |
| download | kernel-qcow2-linux-d7c3c9a609563868d8a70e220399d06a25aba095.tar.gz kernel-qcow2-linux-d7c3c9a609563868d8a70e220399d06a25aba095.tar.xz kernel-qcow2-linux-d7c3c9a609563868d8a70e220399d06a25aba095.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 6ab477060f56..5395200dc9d9 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -908,16 +908,6 @@ static struct miscdevice mce_log_device = { }; /* - * 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=TOLERANCELEVEL (number, see above) * mce=bootlog Log MCEs from before booting. Disabled by default on AMD. @@ -1327,19 +1317,22 @@ void mcheck_init(struct cpuinfo_x86 *c) 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) { mce_disabled = -1; return 1; } -__setup("nomce", mcheck_disable); __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); |