aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/mcount.S
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-25 12:34:22 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-07-18 13:57:05 -0400
commit44304cfbcbb174057781e04a383180989d427ef8 (patch)
tree951c0e82bfef752b98c7588c3455da79cd7054a1 /arch/mips/kernel/mcount.S
parent4082b8664c2abe549a74899584483f286ad5c6c5 (diff)
MIPS: ftrace: Remove check of obsolete variable function_trace_stop
Nothing sets function_trace_stop to disable function tracing anymore. Remove the check for it in the arch code. Cc: Ralf Baechle <ralf@linux-mips.org> Tested-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'arch/mips/kernel/mcount.S')
-rw-r--r--arch/mips/kernel/mcount.S7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S
index 539b6294b613..00940d1d5c4f 100644
--- a/arch/mips/kernel/mcount.S
+++ b/arch/mips/kernel/mcount.S
@@ -74,10 +74,6 @@ _mcount:
74#endif 74#endif
75 75
76 /* When tracing is activated, it calls ftrace_caller+8 (aka here) */ 76 /* When tracing is activated, it calls ftrace_caller+8 (aka here) */
77 lw t1, function_trace_stop
78 bnez t1, ftrace_stub
79 nop
80
81 MCOUNT_SAVE_REGS 77 MCOUNT_SAVE_REGS
82#ifdef KBUILD_MCOUNT_RA_ADDRESS 78#ifdef KBUILD_MCOUNT_RA_ADDRESS
83 PTR_S MCOUNT_RA_ADDRESS_REG, PT_R12(sp) 79 PTR_S MCOUNT_RA_ADDRESS_REG, PT_R12(sp)
@@ -105,9 +101,6 @@ ftrace_stub:
105#else /* ! CONFIG_DYNAMIC_FTRACE */ 101#else /* ! CONFIG_DYNAMIC_FTRACE */
106 102
107NESTED(_mcount, PT_SIZE, ra) 103NESTED(_mcount, PT_SIZE, ra)
108 lw t1, function_trace_stop
109 bnez t1, ftrace_stub
110 nop
111 PTR_LA t1, ftrace_stub 104 PTR_LA t1, ftrace_stub
112 PTR_L t2, ftrace_trace_function /* Prepare t2 for (1) */ 105 PTR_L t2, ftrace_trace_function /* Prepare t2 for (1) */
113 bne t1, t2, static_trace 106 bne t1, t2, static_trace