ARM: 9160/1: NOMMU: Reload __secondary_data after PROCINFO_INITFUNC

__secondary_data used to reside in r7 around call to PROCINFO_INITFUNC. After commit 95731b8 ("ARM: 9059/1: cache-v7: get rid of mini-stack") r7 is used as a scratch register, so we have to reload __secondary_data before we setup the stack pointer. Fixes: 95731b8 ("ARM: 9059/1: cache-v7: get rid of mini-stack") Signed-off-by: Vladimir Murzin <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
kvm-riscv · Dec 17, 2021 · 7202216 · 7202216
1 parent fa55b7d
commit 7202216
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
@@ -114,6 +114,7 @@ ENTRY(secondary_startup)
 	add	r12, r12, r10
 	ret	r12
 1:	bl	__after_proc_init
+	ldr	r7, __secondary_data		@ reload r7
 	ldr	sp, [r7, #12]			@ set up the stack pointer
 	ldr	r0, [r7, #16]			@ set up task pointer
 	mov	fp, #0