]>
Commit | Line | Data |
---|---|---|
4fa5b95e GKH |
1 | From foo@baz Mon 29 Apr 2019 11:38:37 AM CEST |
2 | From: Michael Ellerman <mpe@ellerman.id.au> | |
3 | Date: Mon, 22 Apr 2019 00:20:22 +1000 | |
4 | Subject: powerpc/64: Make meltdown reporting Book3S 64 specific | |
5 | To: stable@vger.kernel.org, gregkh@linuxfoundation.org | |
6 | Cc: linuxppc-dev@ozlabs.org, diana.craciun@nxp.com, msuchanek@suse.de, npiggin@gmail.com, christophe.leroy@c-s.fr | |
7 | Message-ID: <20190421142037.21881-38-mpe@ellerman.id.au> | |
8 | ||
9 | From: Diana Craciun <diana.craciun@nxp.com> | |
10 | ||
11 | commit 406d2b6ae3420f5bb2b3db6986dc6f0b6dbb637b upstream. | |
12 | ||
13 | In a subsequent patch we will enable building security.c for Book3E. | |
14 | However the NXP platforms are not vulnerable to Meltdown, so make the | |
15 | Meltdown vulnerability reporting PPC_BOOK3S_64 specific. | |
16 | ||
17 | Signed-off-by: Diana Craciun <diana.craciun@nxp.com> | |
18 | [mpe: Split out of larger patch] | |
19 | Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> | |
20 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
21 | --- | |
22 | arch/powerpc/kernel/security.c | 2 ++ | |
23 | 1 file changed, 2 insertions(+) | |
24 | ||
25 | --- a/arch/powerpc/kernel/security.c | |
26 | +++ b/arch/powerpc/kernel/security.c | |
27 | @@ -93,6 +93,7 @@ static __init int barrier_nospec_debugfs | |
28 | device_initcall(barrier_nospec_debugfs_init); | |
29 | #endif /* CONFIG_DEBUG_FS */ | |
30 | ||
31 | +#ifdef CONFIG_PPC_BOOK3S_64 | |
32 | ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf) | |
33 | { | |
34 | bool thread_priv; | |
35 | @@ -125,6 +126,7 @@ ssize_t cpu_show_meltdown(struct device | |
36 | ||
37 | return sprintf(buf, "Vulnerable\n"); | |
38 | } | |
39 | +#endif | |
40 | ||
41 | ssize_t cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr, char *buf) | |
42 | { |