Merge tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[deliverable/linux.git] / arch / tile / kernel / mcount_64.S

diff --git a/arch/tile/kernel/mcount_64.S b/arch/tile/kernel/mcount_64.S
index 70d7bb0c4d8f0741a9c4cf8727f3089fe7eab40c..3c2b8d5e1d1a02feb744da440a3bab224b125d6d 100644 (file)
--- 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)