diff options
| author | Julia Cartwright <julia@ni.com> | 2018-08-03 19:54:08 -0500 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-08-03 19:54:08 -0500 |
| commit | 9259e93061d74e7ac76e19c4e51b663f020f7336 (patch) | |
| tree | 1493c03a63772b0941fcc6027dc6e07a1add8d82 /arch/mips/kernel/mcount.S | |
| parent | 80222293eb98ae29255abab7aecae5459750f9a7 (diff) | |
| parent | e692f66fab3019ca8f45463df165177505f38caa (diff) | |
| download | linux-rt-9259e93061d74e7ac76e19c4e51b663f020f7336.tar.gz | |
Merge tag 'v4.9.111' into v4.9-rt
This is the 4.9.111 stable release
Diffstat (limited to 'arch/mips/kernel/mcount.S')
| -rw-r--r-- | arch/mips/kernel/mcount.S | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S index 2f7c734771f4..0df911e772ae 100644 --- a/arch/mips/kernel/mcount.S +++ b/arch/mips/kernel/mcount.S @@ -116,10 +116,20 @@ ftrace_stub: NESTED(_mcount, PT_SIZE, ra) PTR_LA t1, ftrace_stub PTR_L t2, ftrace_trace_function /* Prepare t2 for (1) */ - bne t1, t2, static_trace + beq t1, t2, fgraph_trace nop + MCOUNT_SAVE_REGS + + move a0, ra /* arg1: self return address */ + jalr t2 /* (1) call *ftrace_trace_function */ + move a1, AT /* arg2: parent's return address */ + + MCOUNT_RESTORE_REGS + +fgraph_trace: #ifdef CONFIG_FUNCTION_GRAPH_TRACER + PTR_LA t1, ftrace_stub PTR_L t3, ftrace_graph_return bne t1, t3, ftrace_graph_caller nop @@ -128,24 +138,11 @@ NESTED(_mcount, PT_SIZE, ra) bne t1, t3, ftrace_graph_caller nop #endif - b ftrace_stub -#ifdef CONFIG_32BIT - addiu sp, sp, 8 -#else - nop -#endif -static_trace: - MCOUNT_SAVE_REGS - - move a0, ra /* arg1: self return address */ - jalr t2 /* (1) call *ftrace_trace_function */ - move a1, AT /* arg2: parent's return address */ - - MCOUNT_RESTORE_REGS #ifdef CONFIG_32BIT addiu sp, sp, 8 #endif + .globl ftrace_stub ftrace_stub: RETURN_BACK |