Commit 7202216a authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Russell King (Oracle)
Browse files

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



__secondary_data used to reside in r7 around call to
PROCINFO_INITFUNC. After commit 95731b8e ("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: 95731b8e ("ARM: 9059/1: cache-v7: get rid of mini-stack")
Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent fa55b7dc

arch/arm/kernel/head-nommu.S

+1 −0
Original line number Diff line number Diff line
@@ -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