diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-07-28 09:06:34 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-08-08 00:32:23 +1000 |
| commit | 179ab1cbf883575c3a585bcfc0f2160f1d22a149 (patch) | |
| tree | eead3ee74946fc0b174966ef4fcf1fa02ae8e2fc /arch/powerpc/kernel/vmlinux.lds.S | |
| parent | 6453b532f2c8856a80381e6b9a1f5ea2f12294df (diff) | |
| download | linux-stable-179ab1cbf883575c3a585bcfc0f2160f1d22a149.tar.gz linux-stable-179ab1cbf883575c3a585bcfc0f2160f1d22a149.tar.bz2 linux-stable-179ab1cbf883575c3a585bcfc0f2160f1d22a149.zip | |
powerpc/64: Add CONFIG_PPC_BARRIER_NOSPEC
Add a config symbol to encode which platforms support the
barrier_nospec speculation barrier. Currently this is just Book3S 64
but we will add Book3E in a future patch.
Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 5baac79df97e..07ae018e550e 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -153,14 +153,16 @@ SECTIONS *(__rfi_flush_fixup) __stop___rfi_flush_fixup = .; } +#endif /* CONFIG_PPC64 */ +#ifdef CONFIG_PPC_BARRIER_NOSPEC . = ALIGN(8); __spec_barrier_fixup : AT(ADDR(__spec_barrier_fixup) - LOAD_OFFSET) { __start___barrier_nospec_fixup = .; *(__barrier_nospec_fixup) __stop___barrier_nospec_fixup = .; } -#endif +#endif /* CONFIG_PPC_BARRIER_NOSPEC */ EXCEPTION_TABLE(0) |