---

yaml --- r: 156483 b: refs/heads/master c: 3ef7143 h: refs/heads/master i: 156481: fba13ea 156479: 8f40428 v: v3
git-mirror · Jul 30, 2009 · 70f496e · 70f496e
1 parent c24b751
commit 70f496e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e624859e7eb6ae2930df3923af73406dc6ccdad8
+refs/heads/master: 3ef7143d2287b21e09e00a25a8cb4fbdcf0c6c4c
diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/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 */