| Date | Thu, 26 Jun 2014 12:52:46 -0400 | From | Steven Rostedt <> | Subject | [RFA][PATCH 25/27] arm64, ftrace: Remove check of obsolete variable function_trace_stop |
| |
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
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.
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- arch/arm64/kernel/entry-ftrace.S | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S index b051871f2965..1b1e330e6849 100644 --- a/arch/arm64/kernel/entry-ftrace.S +++ b/arch/arm64/kernel/entry-ftrace.S @@ -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 -- 2.0.0
|