Skip to content

Commit 7202216

Browse files
murzinvRussell King (Oracle)
authored and
Russell King (Oracle)
committed
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 <vladimir.murzin@arm.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
1 parent fa55b7d commit 7202216

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/arm/kernel/head-nommu.S

+1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ ENTRY(secondary_startup)
114114
add r12, r12, r10
115115
ret r12
116116
1: bl __after_proc_init
117+
ldr r7, __secondary_data @ reload r7
117118
ldr sp, [r7, #12] @ set up the stack pointer
118119
ldr r0, [r7, #16] @ set up task pointer
119120
mov fp, #0

0 commit comments

Comments
 (0)