OSDN Git Service

arm64, ftrace: Remove check of obsolete variable function_trace_stop
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>
Wed, 25 Jun 2014 18:41:21 +0000 (14:41 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Fri, 18 Jul 2014 17:58:10 +0000 (13:58 -0400)
Nothing sets function_trace_stop to disable function tracing anymore.
Remove the check for it in the arch code.

arm64 was broken anyway, as it had an ifdef testing
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST which is only set if
the arch supports the code (which it obviously did not), and
it was testing a non existent ftrace_trace_stop instead of
function_trace_stop.

Link: http://lkml.kernel.org/r/20140627124421.GP26276@arm.com
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
arch/arm64/kernel/entry-ftrace.S

index aa5f9fc..38e704e 100644 (file)
  *     - ftrace_graph_caller to set up an exit hook
  */
 ENTRY(_mcount)
-#ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
-       ldr     x0, =ftrace_trace_stop
-       ldr     x0, [x0]                // if ftrace_trace_stop
-       ret                             //   return;
-#endif
        mcount_enter
 
        ldr     x0, =ftrace_trace_function