summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorDiana Craciun <diana.craciun@nxp.com>2019-03-29 22:26:16 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-03 06:26:20 +0200
commit43f40620d7a5a4fd6565219c5001296a75ed427e (patch)
tree1797a190b670e51777a9a8fca7ad2345ccbb81d7 /arch/powerpc/kernel
parenta46a5038263989fff96e884c7cec2680c7a5fc6a (diff)
downloadlinux-stable-43f40620d7a5a4fd6565219c5001296a75ed427e.tar.gz
linux-stable-43f40620d7a5a4fd6565219c5001296a75ed427e.tar.bz2
linux-stable-43f40620d7a5a4fd6565219c5001296a75ed427e.zip
powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used
commit 3bc8ea8603ae4c1e09aca8de229ad38b8091fcb3 upstream. If the user choses not to use the mitigations, replace the code sequence with nops. Signed-off-by: Diana Craciun <diana.craciun@nxp.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/setup-common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 93fa0c99681e..508244bcf19c 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -973,6 +973,7 @@ void __init setup_arch(char **cmdline_p)
ppc_md.setup_arch();
setup_barrier_nospec();
+ setup_spectre_v2();
paging_init();