diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-20 00:10:40 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-20 00:10:40 +0100 |
| commit | 7d83f8fca517b123cf0136503a9e50974f65ec49 (patch) | |
| tree | 92ed1faaf112e98e29a00efc99e1a4e6c79e6a8e /arch/arm/kernel/entry-common.S | |
| parent | [ARM] pass reboot command line to arch_reset() (diff) | |
| parent | [ARM] mv78xx0: Add Marvell RD-78x00-mASA Reference Design support (diff) | |
| download | linux-7d83f8fca517b123cf0136503a9e50974f65ec49.tar.xz linux-7d83f8fca517b123cf0136503a9e50974f65ec49.zip | |
Merge branch 'master' of git://git.marvell.com/orion into devel
Conflicts:
arch/arm/mach-mx1/devices.c
Diffstat (limited to 'arch/arm/kernel/entry-common.S')
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index b8c1f1411440..b55cb0331809 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -115,6 +115,7 @@ ENTRY(mcount) .globl mcount_call mcount_call: bl ftrace_stub + ldr lr, [fp, #-4] @ restore lr ldmia sp!, {r0-r3, pc} ENTRY(ftrace_caller) @@ -126,6 +127,7 @@ ENTRY(ftrace_caller) .globl ftrace_call ftrace_call: bl ftrace_stub + ldr lr, [fp, #-4] @ restore lr ldmia sp!, {r0-r3, pc} #else @@ -137,6 +139,7 @@ ENTRY(mcount) adr r0, ftrace_stub cmp r0, r2 bne trace + ldr lr, [fp, #-4] @ restore lr ldmia sp!, {r0-r3, pc} trace: @@ -145,6 +148,7 @@ trace: sub r0, r0, #MCOUNT_INSN_SIZE mov lr, pc mov pc, r2 + mov lr, r1 @ restore lr ldmia sp!, {r0-r3, pc} #endif /* CONFIG_DYNAMIC_FTRACE */ |