lkml.org 
[lkml]   [2018]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/pti] x86/speculation: Clean up spectre_v2_parse_cmdline()
    Commit-ID:  24848509aa55eac39d524b587b051f4e86df3c12
    Gitweb: https://git.kernel.org/tip/24848509aa55eac39d524b587b051f4e86df3c12
    Author: Tim Chen <tim.c.chen@linux.intel.com>
    AuthorDate: Sun, 25 Nov 2018 19:33:30 +0100
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Wed, 28 Nov 2018 11:57:04 +0100

    x86/speculation: Clean up spectre_v2_parse_cmdline()

    Remove the unnecessary 'else' statement in spectre_v2_parse_cmdline()
    to save an indentation level.

    Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Ingo Molnar <mingo@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Jiri Kosina <jkosina@suse.cz>
    Cc: Tom Lendacky <thomas.lendacky@amd.com>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Cc: David Woodhouse <dwmw@amazon.co.uk>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Dave Hansen <dave.hansen@intel.com>
    Cc: Casey Schaufler <casey.schaufler@intel.com>
    Cc: Asit Mallick <asit.k.mallick@intel.com>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Jon Masters <jcm@redhat.com>
    Cc: Waiman Long <longman9394@gmail.com>
    Cc: Greg KH <gregkh@linuxfoundation.org>
    Cc: Dave Stewart <david.c.stewart@intel.com>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: stable@vger.kernel.org
    Link: https://lkml.kernel.org/r/20181125185003.688010903@linutronix.de


    ---
    arch/x86/kernel/cpu/bugs.c | 27 +++++++++++++--------------
    1 file changed, 13 insertions(+), 14 deletions(-)

    diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
    index 7f6d8159398e..839ab4103e89 100644
    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -276,22 +276,21 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)

    if (cmdline_find_option_bool(boot_command_line, "nospectre_v2"))
    return SPECTRE_V2_CMD_NONE;
    - else {
    - ret = cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(arg));
    - if (ret < 0)
    - return SPECTRE_V2_CMD_AUTO;

    - for (i = 0; i < ARRAY_SIZE(mitigation_options); i++) {
    - if (!match_option(arg, ret, mitigation_options[i].option))
    - continue;
    - cmd = mitigation_options[i].cmd;
    - break;
    - }
    + ret = cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(arg));
    + if (ret < 0)
    + return SPECTRE_V2_CMD_AUTO;

    - if (i >= ARRAY_SIZE(mitigation_options)) {
    - pr_err("unknown option (%s). Switching to AUTO select\n", arg);
    - return SPECTRE_V2_CMD_AUTO;
    - }
    + for (i = 0; i < ARRAY_SIZE(mitigation_options); i++) {
    + if (!match_option(arg, ret, mitigation_options[i].option))
    + continue;
    + cmd = mitigation_options[i].cmd;
    + break;
    + }
    +
    + if (i >= ARRAY_SIZE(mitigation_options)) {
    + pr_err("unknown option (%s). Switching to AUTO select\n", arg);
    + return SPECTRE_V2_CMD_AUTO;
    }

    if ((cmd == SPECTRE_V2_CMD_RETPOLINE ||
    \
     
     \ /
      Last update: 2018-11-28 15:22    [W:4.122 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site