diff options
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
-rw-r--r-- | arch/x86/kernel/mce_64.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 63bda3637085..98cf90f2631d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -994,6 +994,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
994 | 994 | ||
995 | mce [X86-32] Machine Check Exception | 995 | mce [X86-32] Machine Check Exception |
996 | 996 | ||
997 | mce=option [X86-64] See Documentation/x86_64/boot-options.txt | ||
998 | |||
997 | md= [HW] RAID subsystems devices and level | 999 | md= [HW] RAID subsystems devices and level |
998 | See Documentation/md.txt. | 1000 | See Documentation/md.txt. |
999 | 1001 | ||
diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c index 97d2b757d6bd..8ca8f8648969 100644 --- a/arch/x86/kernel/mce_64.c +++ b/arch/x86/kernel/mce_64.c | |||
@@ -695,8 +695,6 @@ static int __init mcheck_disable(char *str) | |||
695 | mce=nobootlog Don't log MCEs from before booting. */ | 695 | mce=nobootlog Don't log MCEs from before booting. */ |
696 | static int __init mcheck_enable(char *str) | 696 | static int __init mcheck_enable(char *str) |
697 | { | 697 | { |
698 | if (*str == '=') | ||
699 | str++; | ||
700 | if (!strcmp(str, "off")) | 698 | if (!strcmp(str, "off")) |
701 | mce_dont_init = 1; | 699 | mce_dont_init = 1; |
702 | else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog")) | 700 | else if (!strcmp(str, "bootlog") || !strcmp(str,"nobootlog")) |
@@ -709,7 +707,7 @@ static int __init mcheck_enable(char *str) | |||
709 | } | 707 | } |
710 | 708 | ||
711 | __setup("nomce", mcheck_disable); | 709 | __setup("nomce", mcheck_disable); |
712 | __setup("mce", mcheck_enable); | 710 | __setup("mce=", mcheck_enable); |
713 | 711 | ||
714 | /* | 712 | /* |
715 | * Sysfs support | 713 | * Sysfs support |