queue-4.9/0035-x86-speculataion-Mark-command-line-parser-data-__ini.patch

   1 From b4c73ddf6234cabb48c2d65f0fec32f87029570e Mon Sep 17 00:00:00 2001
   2 From: Thomas Gleixner <tglx@linutronix.de>
   3 Date: Sun, 25 Nov 2018 19:33:43 +0100
   4 Subject: [PATCH 35/76] x86/speculataion: Mark command line parser data
   5  __initdata
   6
   7 commit 30ba72a990f5096ae08f284de17986461efcc408 upstream.
   8
   9 No point to keep that around.
  10
  11 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  12 Reviewed-by: Ingo Molnar <mingo@kernel.org>
  13 Cc: Peter Zijlstra <peterz@infradead.org>
  14 Cc: Andy Lutomirski <luto@kernel.org>
  15 Cc: Linus Torvalds <torvalds@linux-foundation.org>
  16 Cc: Jiri Kosina <jkosina@suse.cz>
  17 Cc: Tom Lendacky <thomas.lendacky@amd.com>
  18 Cc: Josh Poimboeuf <jpoimboe@redhat.com>
  19 Cc: Andrea Arcangeli <aarcange@redhat.com>
  20 Cc: David Woodhouse <dwmw@amazon.co.uk>
  21 Cc: Tim Chen <tim.c.chen@linux.intel.com>
  22 Cc: Andi Kleen <ak@linux.intel.com>
  23 Cc: Dave Hansen <dave.hansen@intel.com>
  24 Cc: Casey Schaufler <casey.schaufler@intel.com>
  25 Cc: Asit Mallick <asit.k.mallick@intel.com>
  26 Cc: Arjan van de Ven <arjan@linux.intel.com>
  27 Cc: Jon Masters <jcm@redhat.com>
  28 Cc: Waiman Long <longman9394@gmail.com>
  29 Cc: Greg KH <gregkh@linuxfoundation.org>
  30 Cc: Dave Stewart <david.c.stewart@intel.com>
  31 Cc: Kees Cook <keescook@chromium.org>
  32 Link: https://lkml.kernel.org/r/20181125185004.893886356@linutronix.de
  33 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  34 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  35 ---
  36  arch/x86/kernel/cpu/bugs.c | 4 ++--
  37  1 file changed, 2 insertions(+), 2 deletions(-)
  38
  39 diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
  40 index f5bb620f7882..62f1b2e2104e 100644
  41 --- a/arch/x86/kernel/cpu/bugs.c
  42 +++ b/arch/x86/kernel/cpu/bugs.c
  43 @@ -248,7 +248,7 @@ static const struct {
  44         const char *option;
  45         enum spectre_v2_mitigation_cmd cmd;
  46         bool secure;
  47 -} mitigation_options[] = {
  48 +} mitigation_options[] __initdata = {
  49         { "off",                SPECTRE_V2_CMD_NONE,              false },
  50         { "on",                 SPECTRE_V2_CMD_FORCE,             true  },
  51         { "retpoline",          SPECTRE_V2_CMD_RETPOLINE,         false },
  52 @@ -491,7 +491,7 @@ static const char * const ssb_strings[] = {
  53  static const struct {
  54         const char *option;
  55         enum ssb_mitigation_cmd cmd;
  56 -} ssb_mitigation_options[] = {
  57 +} ssb_mitigation_options[]  __initdata = {
  58         { "auto",       SPEC_STORE_BYPASS_CMD_AUTO },    /* Platform decides */
  59         { "on",         SPEC_STORE_BYPASS_CMD_ON },      /* Disable Speculative Store Bypass */
  60         { "off",        SPEC_STORE_BYPASS_CMD_NONE },    /* Don't touch Speculative Store Bypass */
  61 --
  62 2.21.0
  63