lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-rmk-2.6.32' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable

Browse Source
This commit is contained in:
Russell King
2009-08-15 16:51:48 +01:00
committed by Russell King
parent 590a94d934 ac25150f2c
commit 9b2616c2e8
8 changed files with 73 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/kernel/entry-common.S
View File

@@ -118,6 +118,25 @@ ftrace_call:
#else
ENTRY(__gnu_mcount_nc)
stmdb sp!, {r0-r3, lr}
ldr r0, =ftrace_trace_function
ldr r2, [r0]
adr r0, ftrace_stub
cmp r0, r2
bne gnu_trace
ldmia sp!, {r0-r3, ip, lr}
bx ip
gnu_trace:
ldr r1, [sp, #20] @ lr of instrumented routine
mov r0, lr
sub r0, r0, #MCOUNT_INSN_SIZE
mov lr, pc
mov pc, r2
ldmia sp!, {r0-r3, ip, lr}
bx ip
ENTRY(mcount)
stmdb sp!, {r0-r3, lr}
ldr r0, =ftrace_trace_function