diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-25 14:41:21 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-18 13:58:10 -0400 |
| commit | ac694fda326e381d957a591b6b874afdbe8778e6 (patch) | |
| tree | 82f6d5ce17eeb639d2bd5a0fd797b3884200ab48 /arch | |
| parent | 6c56524101a3466263e20a63f851c866ea95c970 (diff) | |
| download | op-kernel-dev-ac694fda326e381d957a591b6b874afdbe8778e6.zip op-kernel-dev-ac694fda326e381d957a591b6b874afdbe8778e6.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/entry-ftrace.S | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S index aa5f9fc..38e704e 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 |
