diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-06-25 12:32:15 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-18 13:57:05 -0400 |
| commit | 4082b8664c2abe549a74899584483f286ad5c6c5 (patch) | |
| tree | 2b7dd2cd8a5cbb48650c9b0819de83dd3b891640 | |
| parent | 41dc27e3b9bd41b900f5aea06f86669e54a2cdd6 (diff) | |
| download | linux-stable-4082b8664c2abe549a74899584483f286ad5c6c5.tar.gz linux-stable-4082b8664c2abe549a74899584483f286ad5c6c5.tar.bz2 linux-stable-4082b8664c2abe549a74899584483f286ad5c6c5.zip | |
parisc: 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.
Link: http://lkml.kernel.org/r/53B08317.7010501@gmx.de
Cc: Kyle McMartin <kyle@mcmartin.ca>
Acked-by: Helge Deller <deller@gmx.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | arch/parisc/Kconfig | 1 | ||||
| -rw-r--r-- | arch/parisc/kernel/ftrace.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 108d48e652af..6e75e2030927 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -6,7 +6,6 @@ config PARISC select HAVE_OPROFILE select HAVE_FUNCTION_TRACER if 64BIT select HAVE_FUNCTION_GRAPH_TRACER if 64BIT - select HAVE_FUNCTION_TRACE_MCOUNT_TEST if 64BIT select ARCH_WANT_FRAME_POINTERS select RTC_CLASS select RTC_DRV_GENERIC diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c index 5512ab32c5e0..559d400f9385 100644 --- a/arch/parisc/kernel/ftrace.c +++ b/arch/parisc/kernel/ftrace.c @@ -155,9 +155,6 @@ void ftrace_function_trampoline(unsigned long parent, { extern ftrace_func_t ftrace_trace_function; - if (function_trace_stop) - return; - if (ftrace_trace_function != ftrace_stub) { ftrace_trace_function(parent, self_addr); return; |