Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[cascardo/linux.git] / arch / mips / kernel / mcount.S

diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S
index 26ceb3c..5d25462 100644 (file)
--- a/arch/mips/kernel/mcount.S
+++ b/arch/mips/kernel/mcount.S
@@ -74,10 +74,6 @@ _mcount:
 #endif
 
        /* When tracing is activated, it calls ftrace_caller+8 (aka here) */
-       lw      t1, function_trace_stop
-       bnez    t1, ftrace_stub
-        nop
-
        MCOUNT_SAVE_REGS
 #ifdef KBUILD_MCOUNT_RA_ADDRESS
        PTR_S   MCOUNT_RA_ADDRESS_REG, PT_R12(sp)
@@ -118,9 +114,6 @@ ftrace_stub:
 #else  /* ! CONFIG_DYNAMIC_FTRACE */
 
 NESTED(_mcount, PT_SIZE, ra)
-       lw      t1, function_trace_stop
-       bnez    t1, ftrace_stub
-        nop
        PTR_LA  t1, ftrace_stub
        PTR_L   t2, ftrace_trace_function /* Prepare t2 for (1) */
        bne     t1, t2, static_trace