git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
entry-common.S
diff --git
a/arch/arm/kernel/entry-common.S
b/arch/arm/kernel/entry-common.S
index
366e509
..
8c3de1a
100644
(file)
--- 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 */