Commit ac694fda authored Jun 25, 2014 by Steven Rostedt (Red Hat) Committed by Steven Rostedt Jul 18, 2014

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

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>

parent 6c565241

arch/arm64/kernel/entry-ftrace.S

+0 −5

Original line number	Diff line number	Diff line
		@@ -96,11 +96,6 @@
		* - 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