[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-5c31b2800d8d3e735e5ecac8fc13d1cf862fd330@git.kernel.org>
Date: Sun, 7 Jun 2015 10:39:04 -0700
From: tip-bot for Xie XiuQi <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: xiexiuqi@...wei.com, linux-kernel@...r.kernel.org,
dvlasenk@...hat.com, tglx@...utronix.de, peterz@...radead.org,
luto@...capital.net, mingo@...nel.org, hpa@...or.com, bp@...en8.de,
brgerst@...il.com, tony.luck@...el.com,
torvalds@...ux-foundation.org, bp@...e.de
Subject: [tip:x86/core] x86/mce:
Fix monarch timeout setting through the mce= cmdline option
Commit-ID: 5c31b2800d8d3e735e5ecac8fc13d1cf862fd330
Gitweb: http://git.kernel.org/tip/5c31b2800d8d3e735e5ecac8fc13d1cf862fd330
Author: Xie XiuQi <xiexiuqi@...wei.com>
AuthorDate: Tue, 26 May 2015 10:28:21 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 27 May 2015 14:39:14 +0200
x86/mce: Fix monarch timeout setting through the mce= cmdline option
Using "mce=1,10000000" on the kernel cmdline to change the
monarch timeout does not work. The cause is that get_option()
does parse a subsequent comma in the option string and signals
that with a return value. So we don't need to check for a second
comma ourselves.
Signed-off-by: Xie XiuQi <xiexiuqi@...wei.com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Tony Luck <tony.luck@...el.com>
Link: http://lkml.kernel.org/r/1432120943-25028-1-git-send-email-xiexiuqi@huawei.com
Link: http://lkml.kernel.org/r/1432628901-18044-19-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/cpu/mcheck/mce.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 521e501..0cbcd31 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2014,11 +2014,8 @@ static int __init mcheck_enable(char *str)
else if (!strcmp(str, "bios_cmci_threshold"))
cfg->bios_cmci_threshold = true;
else if (isdigit(str[0])) {
- get_option(&str, &(cfg->tolerant));
- if (*str == ',') {
- ++str;
+ if (get_option(&str, &cfg->tolerant) == 2)
get_option(&str, &(cfg->monarch_timeout));
- }
} else {
pr_info("mce argument %s ignored. Please use /sys\n", str);
return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists