From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FE3AC43441 for ; Wed, 28 Nov 2018 14:21:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D30B02086B for ; Wed, 28 Nov 2018 14:21:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D30B02086B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zytor.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728631AbeK2BXW (ORCPT ); Wed, 28 Nov 2018 20:23:22 -0500 Received: from terminus.zytor.com ([198.137.202.136]:49423 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727823AbeK2BXV (ORCPT ); Wed, 28 Nov 2018 20:23:21 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id wASEKpsG2320641 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 28 Nov 2018 06:20:51 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id wASEKpMW2320638; Wed, 28 Nov 2018 06:20:51 -0800 Date: Wed, 28 Nov 2018 06:20:51 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Tim Chen Message-ID: Cc: asit.k.mallick@intel.com, dave.hansen@intel.com, dwmw@amazon.co.uk, tglx@linutronix.de, jkosina@suse.cz, tim.c.chen@linux.intel.com, mingo@kernel.org, jcm@redhat.com, torvalds@linux-foundation.org, ak@linux.intel.com, peterz@infradead.org, arjan@linux.intel.com, thomas.lendacky@amd.com, gregkh@linuxfoundation.org, aarcange@redhat.com, linux-kernel@vger.kernel.org, casey.schaufler@intel.com, david.c.stewart@intel.com, jpoimboe@redhat.com, longman9394@gmail.com, keescook@chromium.org, luto@kernel.org, hpa@zytor.com Reply-To: gregkh@linuxfoundation.org, thomas.lendacky@amd.com, aarcange@redhat.com, linux-kernel@vger.kernel.org, casey.schaufler@intel.com, david.c.stewart@intel.com, jpoimboe@redhat.com, longman9394@gmail.com, keescook@chromium.org, luto@kernel.org, hpa@zytor.com, asit.k.mallick@intel.com, dave.hansen@intel.com, dwmw@amazon.co.uk, tglx@linutronix.de, jkosina@suse.cz, tim.c.chen@linux.intel.com, mingo@kernel.org, peterz@infradead.org, jcm@redhat.com, ak@linux.intel.com, torvalds@linux-foundation.org, arjan@linux.intel.com In-Reply-To: <20181125185003.688010903@linutronix.de> References: <20181125185003.688010903@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/speculation: Clean up spectre_v2_parse_cmdline() Git-Commit-ID: 24848509aa55eac39d524b587b051f4e86df3c12 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 24848509aa55eac39d524b587b051f4e86df3c12 Gitweb: https://git.kernel.org/tip/24848509aa55eac39d524b587b051f4e86df3c12 Author: Tim Chen AuthorDate: Sun, 25 Nov 2018 19:33:30 +0100 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner Reviewed-by: Ingo Molnar Cc: Peter Zijlstra Cc: Andy Lutomirski Cc: Linus Torvalds Cc: Jiri Kosina Cc: Tom Lendacky Cc: Josh Poimboeuf Cc: Andrea Arcangeli Cc: David Woodhouse Cc: Andi Kleen Cc: Dave Hansen Cc: Casey Schaufler Cc: Asit Mallick Cc: Arjan van de Ven Cc: Jon Masters Cc: Waiman Long Cc: Greg KH Cc: Dave Stewart Cc: Kees Cook 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 ||