2 files changed, 0 insertions, 19 deletions

diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 4f3006b600e3..7fcd492adbfc 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -128,7 +128,6 @@ config TILEGX
         select SPARSE_IRQ
         select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
         select HAVE_FUNCTION_TRACER
-        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
diff --git a/arch/tile/kernel/mcount_64.S b/arch/tile/kernel/mcount_64.S
index 70d7bb0c4d8f..3c2b8d5e1d1a 100644
--- a/arch/tile/kernel/mcount_64.S
+++ b/arch/tile/kernel/mcount_64.S
@@ -77,15 +77,6 @@ STD_ENDPROC(__mcount)
 
         .align  64
 STD_ENTRY(ftrace_caller)
-        moveli  r11, hw2_last(function_trace_stop)
-        { shl16insli    r11, r11, hw1(function_trace_stop); move r12, lr }
-        { shl16insli    r11, r11, hw0(function_trace_stop); move lr, r10 }
-        ld      r11, r11
-        beqz    r11, 1f
-        jrp     r12
-
-1:
-        { move  r10, lr; move   lr, r12 }
         MCOUNT_SAVE_REGS
 
         /* arg1: self return address */
@@ -119,15 +110,6 @@ STD_ENDPROC(ftrace_caller)
 
         .align  64
 STD_ENTRY(__mcount)
-        moveli  r11, hw2_last(function_trace_stop)
-        { shl16insli    r11, r11, hw1(function_trace_stop); move r12, lr }
-        { shl16insli    r11, r11, hw0(function_trace_stop); move lr, r10 }
-        ld      r11, r11
-        beqz    r11, 1f
-        jrp     r12
-
-1:
-        { move  r10, lr; move   lr, r12 }
         {
          moveli r11, hw2_last(ftrace_trace_function)
          moveli r13, hw2_last(ftrace_stub)