X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fentry-common.S;h=8c3de1a350b5dd85bdf06b79f1dab163cd305743;hb=a1d12511157c8d22a5a6779f8a9d73a1adcfc3b0;hp=366e5097a41a4f535d1d24ddccab44f13580fb64;hpb=fbe8cddd2d85979d273d7937a2b8a47498694d91;p=pandora-kernel.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 */