From 7f7d2583fc7797046306b79e20b9d19e9b104362 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 17 Oct 2007 18:04:38 +0200 Subject: [PATCH] --- yaml --- r: 70999 b: refs/heads/master c: 909dd324fb57ad690c38c4e3d52337defa099ce8 h: refs/heads/master i: 70997: cd6eb15decf99fcaafeec49948275d86c742875e 70995: 8a66c19caecba893709e5fe0806a96f096adea92 70991: 29d6e8e77619974d2dc4f6a01627e44f13b2d90b v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 2 ++ trunk/arch/x86/kernel/mce_64.c | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index eb961c910a78..10b093f43ac5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffecad95eed621a82e8131b929cfcc3bb2a10d46 +refs/heads/master: 909dd324fb57ad690c38c4e3d52337defa099ce8 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 63bda3637085..98cf90f2631d 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -994,6 +994,8 @@ and is between 256 and 4096 characters. It is defined in the file mce [X86-32] Machine Check Exception + mce=option [X86-64] See Documentation/x86_64/boot-options.txt + md= [HW] RAID subsystems devices and level See Documentation/md.txt. diff --git a/trunk/arch/x86/kernel/mce_64.c b/trunk/arch/x86/kernel/mce_64.c index 97d2b757d6bd..8ca8f8648969 100644 --- a/trunk/arch/x86/kernel/mce_64.c +++ b/trunk/arch/x86/kernel/mce_64.c @@ -695,8 +695,6 @@ static int __init mcheck_disable(char *str) mce=nobootlog Don't log MCEs from before booting. */ static int __init mcheck_enable(char *str) { - if (*str == '=') - str++; if (!strcmp(str, "off")) mce_dont_init = 1; else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog")) @@ -709,7 +707,7 @@ static int __init mcheck_enable(char *str) } __setup("nomce", mcheck_disable); -__setup("mce", mcheck_enable); +__setup("mce=", mcheck_enable); /* * Sysfs support