Commit 3ef7143d authored Jul 29, 2009 by Uwe Kleine-König Committed by Russell King Jul 30, 2009

ARM: 5627/1: Fix restoring of lr at the end of mcount



After ftrace_trace_function is called r1 is probably clobbered so don't
try to use its value for restoring.

This was introduced in v2.6.29~38^2~7

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent e624859e

arch/arm/kernel/entry-common.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ trace:
		sub r0, r0, #MCOUNT_INSN_SIZE
		mov lr, pc
		mov pc, r2
		mov lr, r1 @ restore lr
		ldr lr, [fp, #-4] @ restore lr
		ldmia sp!, {r0-r3, pc}

		#endif /* CONFIG_DYNAMIC_FTRACE */