| From foo@baz Fri Mar 29 15:53:50 CET 2019 |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| Date: Fri, 29 Mar 2019 22:26:00 +1100 |
| Subject: powerpc/64: Make meltdown reporting Book3S 64 specific |
| To: stable@vger.kernel.org, gregkh@linuxfoundation.org |
| Cc: linuxppc-dev@ozlabs.org, diana.craciun@nxp.com, msuchanek@suse.de, christophe.leroy@c-s.fr |
| Message-ID: <20190329112620.14489-13-mpe@ellerman.id.au> |
| |
| From: Diana Craciun <diana.craciun@nxp.com> |
| |
| commit 406d2b6ae3420f5bb2b3db6986dc6f0b6dbb637b upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/powerpc/kernel/security.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/arch/powerpc/kernel/security.c |
| +++ b/arch/powerpc/kernel/security.c |
| @@ -92,6 +92,7 @@ static __init int barrier_nospec_debugfs |
| 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 |
| |
| return sprintf(buf, "Vulnerable\n"); |
| } |
| +#endif |
| |
| ssize_t cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr, char *buf) |
| { |