From: "Steven Rostedt (Red Hat)" <rost...@goodmis.org>

Nothing sets function_trace_stop to disable function tracing anymore.
Remove the check for it in the arch code.

[ Please test this on your arch ]

Cc: James Hogan <james.ho...@imgtec.com>
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
---
 arch/metag/Kconfig              |  1 -
 arch/metag/kernel/ftrace_stub.S | 14 --------------
 2 files changed, 15 deletions(-)

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 499b7610eaaf..0b389a81c43a 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -13,7 +13,6 @@ config METAG
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_TRACER
-       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_LZO
diff --git a/arch/metag/kernel/ftrace_stub.S b/arch/metag/kernel/ftrace_stub.S
index e70bff745bdd..3acc288217c0 100644
--- a/arch/metag/kernel/ftrace_stub.S
+++ b/arch/metag/kernel/ftrace_stub.S
@@ -16,13 +16,6 @@ _mcount_wrapper:
        .global _ftrace_caller
        .type   _ftrace_caller,function
 _ftrace_caller:
-       MOVT    D0Re0,#HI(_function_trace_stop)
-       ADD     D0Re0,D0Re0,#LO(_function_trace_stop)
-       GETD    D0Re0,[D0Re0]
-       CMP     D0Re0,#0
-       BEQ     $Lcall_stub
-       MOV     PC,D0.4
-$Lcall_stub:
        MSETL   [A0StP], D0Ar6, D0Ar4, D0Ar2, D0.4
        MOV     D1Ar1, D0.4
        MOV     D0Ar2, D1RtP
@@ -42,13 +35,6 @@ _ftrace_call:
        .global _mcount_wrapper
        .type   _mcount_wrapper,function
 _mcount_wrapper:
-       MOVT    D0Re0,#HI(_function_trace_stop)
-       ADD     D0Re0,D0Re0,#LO(_function_trace_stop)
-       GETD    D0Re0,[D0Re0]
-       CMP     D0Re0,#0
-       BEQ     $Lcall_mcount
-       MOV     PC,D0.4
-$Lcall_mcount:
        MSETL   [A0StP], D0Ar6, D0Ar4, D0Ar2, D0.4
        MOV     D1Ar1, D0.4
        MOV     D0Ar2, D1RtP
-- 
2.0.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to