queue-4.9/powerpc-64-make-stf-barrier-ppc_book3s_64-specific.patch

   1 From e459c26b740a2b619098ce3da2f060005d6700c0 Mon Sep 17 00:00:00 2001
   2 From: Diana Craciun <diana.craciun@nxp.com>
   3 Date: Thu, 11 Apr 2019 21:46:07 +1000
   4 Subject: powerpc/64: Make stf barrier PPC_BOOK3S_64 specific.
   5
   6 commit 6453b532f2c8856a80381e6b9a1f5ea2f12294df upstream.
   7
   8 NXP Book3E platforms are not vulnerable to speculative store
   9 bypass, so make the mitigations PPC_BOOK3S_64 specific.
  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/security.c | 2 ++
  16  1 file changed, 2 insertions(+)
  17
  18 diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
  19 index 813e38ff81ce..926ed3c38741 100644
  20 --- a/arch/powerpc/kernel/security.c
  21 +++ b/arch/powerpc/kernel/security.c
  22 @@ -177,6 +177,7 @@ ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, c
  23         return s.len;
  24  }
  25
  26 +#ifdef CONFIG_PPC_BOOK3S_64
  27  /*
  28   * Store-forwarding barrier support.
  29   */
  30 @@ -324,3 +325,4 @@ static __init int stf_barrier_debugfs_init(void)
  31  }
  32  device_initcall(stf_barrier_debugfs_init);
  33  #endif /* CONFIG_DEBUG_FS */
  34 +#endif /* CONFIG_PPC_BOOK3S_64 */
  35 --
  36 2.19.1
  37