]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
microblaze: ftrace: Remove check of obsolete variable function_trace_stop
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>
Wed, 25 Jun 2014 16:37:43 +0000 (12:37 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Fri, 18 Jul 2014 17:57:08 +0000 (13:57 -0400)
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/53C8D82B.4030204@monstr.eu
Tested-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
arch/microblaze/Kconfig
arch/microblaze/kernel/mcount.S

index 9ae08541e30d0c5ec9ed2d94badd95c6afbf289a..40e1c1dd0e24a47d38f142ce0c5543d629a0fd50 100644 (file)
@@ -22,7 +22,6 @@ config MICROBLAZE
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_FUNCTION_GRAPH_TRACER
-       select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FUNCTION_TRACER
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
index fc1e1322ce4c9b58d1ad7527367569748d7c95d1..fed9da5de8c43caa577827d6b2c82d895d181d3a 100644 (file)
@@ -91,11 +91,6 @@ ENTRY(ftrace_caller)
 #endif /* CONFIG_DYNAMIC_FTRACE */
        SAVE_REGS
        swi     r15, r1, 0;
-       /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST begin of checking */
-       lwi     r5, r0, function_trace_stop;
-       bneid   r5, end;
-       nop;
-       /* MS: HAVE_FUNCTION_TRACE_MCOUNT_TEST end of checking */
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 #ifndef CONFIG_DYNAMIC_FTRACE
        lwi     r5, r0, ftrace_graph_return;