2 files changed, 2 insertions, 9 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 407c87d9879a..4692c90936f1 100644
--- 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_TRACE_MCOUNT_TEST
         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 3ad6cbdc2163..0b0ed4d34219 100644
--- 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
-        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
@@ -80,11 +77,8 @@ ftrace_stub:
         .globl          ftrace_caller
         .type           ftrace_caller,#function
 ftrace_caller:
-        sethi           %hi(function_trace_stop), %g1
         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