Blackfin: 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/3144266.ziutPk5CNZ@vapier
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index f81e7b989fff988eb008a55cb6337b9202010d07..ed30699cc6358fbc96793451c0897abec0e55b5a 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -18,7 +18,6 @@ config BLACKFIN
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACER
-       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_IDE
        select HAVE_KERNEL_GZIP if RAMKERNEL
        select HAVE_KERNEL_BZIP2 if RAMKERNEL

diff --git a/arch/blackfin/kernel/ftrace-entry.S b/arch/blackfin/kernel/ftrace-entry.S
index 7eed00bbd26df9fe2cae268e1ccca2cbe38122b4..28d059540424f5ac07ffae53e556d5d2c6f1393f 100644 (file)
--- a/arch/blackfin/kernel/ftrace-entry.S
+++ b/arch/blackfin/kernel/ftrace-entry.S
@@ -33,15 +33,6 @@ ENDPROC(__mcount)
  * function will be waiting there.  mmmm pie.
  */
 ENTRY(_ftrace_caller)
-# ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
-       /* optional micro optimization: return if stopped */
-       p1.l = _function_trace_stop;
-       p1.h = _function_trace_stop;
-       r3 = [p1];
-       cc = r3 == 0;
-       if ! cc jump _ftrace_stub (bp);
-# endif
-
        /* save first/second/third function arg and the return register */
        [--sp] = r2;
        [--sp] = r0;
@@ -83,15 +74,6 @@ ENDPROC(_ftrace_caller)
 
 /* See documentation for _ftrace_caller */
 ENTRY(__mcount)
-# ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
-       /* optional micro optimization: return if stopped */
-       p1.l = _function_trace_stop;
-       p1.h = _function_trace_stop;
-       r3 = [p1];
-       cc = r3 == 0;
-       if ! cc jump _ftrace_stub (bp);
-# endif
-
        /* save third function arg early so we can do testing below */
        [--sp] = r2;