sparc64,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.

Link: http://lkml.kernel.org/r/20140703.211820.1674895115102216877.davem@davemloft.net
Cc: David S. Miller <davem@davemloft.net>
OKed-to-go-through-tracing-tree-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 29f2e98..abd7d55 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -55,7 +55,6 @@ config SPARC64
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_GRAPH_FP_TEST
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_GRAPH_FP_TEST

-       select HAVE_FUNCTION_TRACE_MCOUNT_TEST

        select HAVE_KRETPROBES
        select HAVE_KPROBES
        select HAVE_RCU_TABLE_FREE if SMP
        select HAVE_KRETPROBES
        select HAVE_KPROBES
        select HAVE_RCU_TABLE_FREE if SMP

diff --git a/arch/sparc/lib/mcount.S b/arch/sparc/lib/mcount.S
index 3ad6cbd..0b0ed4d 100644 (file)
--- a/arch/sparc/lib/mcount.S
+++ b/arch/sparc/lib/mcount.S
@@ -24,10 +24,7 @@ mcount:
 #ifdef CONFIG_DYNAMIC_FTRACE
        /* Do nothing, the retl/nop below is all we need.  */
 #else
 #ifdef CONFIG_DYNAMIC_FTRACE
        /* Do nothing, the retl/nop below is all we need.  */
 #else

-       sethi           %hi(function_trace_stop), %g1
-       lduw            [%g1 + %lo(function_trace_stop)], %g2
-       brnz,pn         %g2, 2f
-        sethi          %hi(ftrace_trace_function), %g1
+       sethi           %hi(ftrace_trace_function), %g1

        sethi           %hi(ftrace_stub), %g2
        ldx             [%g1 + %lo(ftrace_trace_function)], %g1
        or              %g2, %lo(ftrace_stub), %g2
        sethi           %hi(ftrace_stub), %g2
        ldx             [%g1 + %lo(ftrace_trace_function)], %g1
        or              %g2, %lo(ftrace_stub), %g2


@@ -80,11 +77,8 @@ ftrace_stub:
        .globl          ftrace_caller
        .type           ftrace_caller,#function
 ftrace_caller:
        .globl          ftrace_caller
        .type           ftrace_caller,#function
 ftrace_caller:

-       sethi           %hi(function_trace_stop), %g1

        mov             %i7, %g2
        mov             %i7, %g2

-       lduw            [%g1 + %lo(function_trace_stop)], %g1
-       brnz,pn         %g1, ftrace_stub
-        mov            %fp, %g3
+       mov             %fp, %g3

        save            %sp, -176, %sp
        mov             %g2, %o1
        mov             %g2, %l0
        save            %sp, -176, %sp
        mov             %g2, %o1
        mov             %g2, %l0