queue-4.9/0024-x86-speculation-Remove-unnecessary-ret-variable-in-c.patch

   1 From dbe243f57858dc30a978947f6d211ea4eacad062 Mon Sep 17 00:00:00 2001
   2 From: Tim Chen <tim.c.chen@linux.intel.com>
   3 Date: Sun, 25 Nov 2018 19:33:31 +0100
   4 Subject: [PATCH 24/76] x86/speculation: Remove unnecessary ret variable in
   5  cpu_show_common()
   6
   7 commit b86bda0426853bfe8a3506c7d2a5b332760ae46b upstream.
   8
   9 Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
  10 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  11 Reviewed-by: Ingo Molnar <mingo@kernel.org>
  12 Cc: Peter Zijlstra <peterz@infradead.org>
  13 Cc: Andy Lutomirski <luto@kernel.org>
  14 Cc: Linus Torvalds <torvalds@linux-foundation.org>
  15 Cc: Jiri Kosina <jkosina@suse.cz>
  16 Cc: Tom Lendacky <thomas.lendacky@amd.com>
  17 Cc: Josh Poimboeuf <jpoimboe@redhat.com>
  18 Cc: Andrea Arcangeli <aarcange@redhat.com>
  19 Cc: David Woodhouse <dwmw@amazon.co.uk>
  20 Cc: Andi Kleen <ak@linux.intel.com>
  21 Cc: Dave Hansen <dave.hansen@intel.com>
  22 Cc: Casey Schaufler <casey.schaufler@intel.com>
  23 Cc: Asit Mallick <asit.k.mallick@intel.com>
  24 Cc: Arjan van de Ven <arjan@linux.intel.com>
  25 Cc: Jon Masters <jcm@redhat.com>
  26 Cc: Waiman Long <longman9394@gmail.com>
  27 Cc: Greg KH <gregkh@linuxfoundation.org>
  28 Cc: Dave Stewart <david.c.stewart@intel.com>
  29 Cc: Kees Cook <keescook@chromium.org>
  30 Link: https://lkml.kernel.org/r/20181125185003.783903657@linutronix.de
  31 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  32 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  33 ---
  34  arch/x86/kernel/cpu/bugs.c | 5 +----
  35  1 file changed, 1 insertion(+), 4 deletions(-)
  36
  37 diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
  38 index 62da71f523b6..7b47cdf6414e 100644
  39 --- a/arch/x86/kernel/cpu/bugs.c
  40 +++ b/arch/x86/kernel/cpu/bugs.c
  41 @@ -853,8 +853,6 @@ static ssize_t l1tf_show_state(char *buf)
  42  static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,
  43                                char *buf, unsigned int bug)
  44  {
  45 -       int ret;
  46 -
  47         if (!boot_cpu_has_bug(bug))
  48                 return sprintf(buf, "Not affected\n");
  49
  50 @@ -869,13 +867,12 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr
  51                 return sprintf(buf, "Mitigation: __user pointer sanitization\n");
  52
  53         case X86_BUG_SPECTRE_V2:
  54 -               ret = sprintf(buf, "%s%s%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],
  55 +               return sprintf(buf, "%s%s%s%s%s%s\n", spectre_v2_strings[spectre_v2_enabled],
  56                                boot_cpu_has(X86_FEATURE_USE_IBPB) ? ", IBPB" : "",
  57                                boot_cpu_has(X86_FEATURE_USE_IBRS_FW) ? ", IBRS_FW" : "",
  58                                (x86_spec_ctrl_base & SPEC_CTRL_STIBP) ? ", STIBP" : "",
  59                                boot_cpu_has(X86_FEATURE_RSB_CTXSW) ? ", RSB filling" : "",
  60                                spectre_v2_module_string());
  61 -               return ret;
  62
  63         case X86_BUG_SPEC_STORE_BYPASS:
  64                 return sprintf(buf, "%s\n", ssb_strings[ssb_mode]);
  65 --
  66 2.21.0
  67