aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-25 12:32:15 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-07-18 13:57:05 -0400
commit4082b8664c2abe549a74899584483f286ad5c6c5 (patch)
tree2b7dd2cd8a5cbb48650c9b0819de83dd3b891640 /arch/parisc
parent41dc27e3b9bd41b900f5aea06f86669e54a2cdd6 (diff)
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>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/Kconfig1
-rw-r--r--arch/parisc/kernel/ftrace.c3
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
6 select HAVE_OPROFILE 6 select HAVE_OPROFILE
7 select HAVE_FUNCTION_TRACER if 64BIT 7 select HAVE_FUNCTION_TRACER if 64BIT
8 select HAVE_FUNCTION_GRAPH_TRACER if 64BIT 8 select HAVE_FUNCTION_GRAPH_TRACER if 64BIT
9 select HAVE_FUNCTION_TRACE_MCOUNT_TEST if 64BIT
10 select ARCH_WANT_FRAME_POINTERS 9 select ARCH_WANT_FRAME_POINTERS
11 select RTC_CLASS 10 select RTC_CLASS
12 select RTC_DRV_GENERIC 11 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,
155{ 155{
156 extern ftrace_func_t ftrace_trace_function; 156 extern ftrace_func_t ftrace_trace_function;
157 157
158 if (function_trace_stop)
159 return;
160
161 if (ftrace_trace_function != ftrace_stub) { 158 if (ftrace_trace_function != ftrace_stub) {
162 ftrace_trace_function(parent, self_addr); 159 ftrace_trace_function(parent, self_addr);
163 return; 160 return;