aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiana Craciun <diana.craciun@nxp.com>2018-07-28 09:06:36 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2018-08-08 00:32:24 +1000
commit406d2b6ae3420f5bb2b3db6986dc6f0b6dbb637b (patch)
treef94d12d30bb0838aa17a7b51fe10b88dae03d315
parentpowerpc/64: Call setup_barrier_nospec() from setup_arch() (diff)
downloadlinux-dev-406d2b6ae3420f5bb2b3db6986dc6f0b6dbb637b.tar.xz
linux-dev-406d2b6ae3420f5bb2b3db6986dc6f0b6dbb637b.zip
powerpc/64: Make meltdown reporting Book3S 64 specific
In a subsequent patch we will enable building security.c for Book3E. However the NXP platforms are not vulnerable to Meltdown, so make the Meltdown vulnerability reporting PPC_BOOK3S_64 specific. Signed-off-by: Diana Craciun <diana.craciun@nxp.com> [mpe: Split out of larger patch] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/kernel/security.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
index 8ee1ade845c6..206488603b66 100644
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -92,6 +92,7 @@ static __init int barrier_nospec_debugfs_init(void)
device_initcall(barrier_nospec_debugfs_init);
#endif /* CONFIG_DEBUG_FS */
+#ifdef CONFIG_PPC_BOOK3S_64
ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf)
{
bool thread_priv;
@@ -124,6 +125,7 @@ ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, cha
return sprintf(buf, "Vulnerable\n");
}
+#endif
ssize_t cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr, char *buf)
{