releases/4.9.169/powerpc-fsl-enable-runtime-patching-if-nospectre_v2-.patch

   1 From bda110d185f3d87ed8fd9339e7c12e34a5381eb2 Mon Sep 17 00:00:00 2001
   2 From: Diana Craciun <diana.craciun@nxp.com>
   3 Date: Thu, 11 Apr 2019 21:46:26 +1000
   4 Subject: powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used
   5
   6 commit 3bc8ea8603ae4c1e09aca8de229ad38b8091fcb3 upstream.
   7
   8 If the user choses not to use the mitigations, replace
   9 the code sequence with nops.
  10
  11 Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
  12 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  13 Signed-off-by: Sasha Levin <sashal@kernel.org>
  14 ---
  15  arch/powerpc/kernel/setup-common.c | 1 +
  16  1 file changed, 1 insertion(+)
  17
  18 diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
  19 index d5a128f54537..5e7d70c5d065 100644
  20 --- a/arch/powerpc/kernel/setup-common.c
  21 +++ b/arch/powerpc/kernel/setup-common.c
  22 @@ -919,6 +919,7 @@ void __init setup_arch(char **cmdline_p)
  23                 ppc_md.setup_arch();
  24
  25         setup_barrier_nospec();
  26 +       setup_spectre_v2();
  27
  28         paging_init();
  29
  30 --
  31 2.19.1
  32