aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2019-06-11 15:47:20 +0000
committerMichael Ellerman <mpe@ellerman.id.au>2019-06-15 23:43:54 +1000
commitb7f8b440f3001cc1775c028f0a783786113c2ae3 (patch)
treed406d47276a6f419518ce55f8d073970c6fc2f89
parentpowerpc/32s: fix booting with CONFIG_PPC_EARLY_DEBUG_BOOTX (diff)
downloadlinux-dev-b7f8b440f3001cc1775c028f0a783786113c2ae3.tar.xz
linux-dev-b7f8b440f3001cc1775c028f0a783786113c2ae3.zip
powerpc/32s: fix initial setup of segment registers on secondary CPU
The patch referenced below moved the loading of segment registers out of load_up_mmu() in order to do it earlier in the boot sequence. However, the secondary CPU still needs it to be done when loading up the MMU. Reported-by: Erhard F. <erhard_f@mailbox.org> Fixes: 215b823707ce ("powerpc/32s: set up an early static hash table for KASAN") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/kernel/head_32.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 755fab9641d6..c82947a3892a 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -757,6 +757,7 @@ __secondary_start:
stw r0,0(r3)
/* load up the MMU */
+ bl load_segment_registers
bl load_up_mmu
/* ptr to phys current thread */