lkml.org 
[lkml]   [2018]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch V2 02/28] x86/speculation: Clean up spectre_v2_parse_cmdline()
On Sun, Nov 25, 2018 at 07:33:30PM +0100, Thomas Gleixner wrote:
> 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: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Thank you!
>
> ---
> arch/x86/kernel/cpu/bugs.c | 27 +++++++++++++--------------
> 1 file changed, 13 insertions(+), 14 deletions(-)
>
> --- a/arch/x86/kernel/cpu/bugs.c
> +++ b/arch/x86/kernel/cpu/bugs.c
> @@ -276,22 +276,21 @@ static enum spectre_v2_mitigation_cmd __
>
> 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-29 15:41    [W:0.438 / U:0.712 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site