lkml.org 
[lkml]   [2015]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    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@huawei.com>
    AuthorDate: Tue, 26 May 2015 10:28:21 +0200
    Committer: Ingo Molnar <mingo@kernel.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@huawei.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Tony Luck <tony.luck@intel.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@kernel.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;

    \
     
     \ /
      Last update: 2015-06-07 20:21    [W:3.921 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site