X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fentry-common.S;h=8c3de1a350b5dd85bdf06b79f1dab163cd305743;hb=3ef7143d2287b21e09e00a25a8cb4fbdcf0c6c4c;hp=366e5097a41a4f535d1d24ddccab44f13580fb64;hpb=e624859e7eb6ae2930df3923af73406dc6ccdad8;p=deliverable%2Flinux.git

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 366e5097a41a..8c3de1a350b5 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -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 */