summaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-25 10:17:48 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-07-18 13:56:56 -0400
commit3a46588e4b843afaa8f989fb494172d10e007afb (patch)
tree9db294a6abdbd5f86528aede430c079082b68c2b /arch/parisc
parent6a8a5051130fd2e2b5f978a5a2e222fcc7d2dff4 (diff)
downloadlinux-3a46588e4b843afaa8f989fb494172d10e007afb.tar.gz
linux-3a46588e4b843afaa8f989fb494172d10e007afb.tar.bz2
linux-3a46588e4b843afaa8f989fb494172d10e007afb.zip
parisc: ftrace: Add call to ftrace_graph_is_dead() in function graph code
ftrace_stop() is going away as it disables parts of function tracing that affects users that should not be affected. But ftrace_graph_stop() is built on ftrace_stop(). Here's another example of killing all of function tracing because something went wrong with function graph tracing. Instead of disabling all users of function tracing on function graph error, disable only function graph tracing. To do this, the arch code must call ftrace_graph_is_dead() before it implements function graph. 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/kernel/ftrace.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c
index 5beb97bafbb1..5512ab32c5e0 100644
--- a/arch/parisc/kernel/ftrace.c
+++ b/arch/parisc/kernel/ftrace.c
@@ -112,6 +112,9 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
unsigned long long calltime;
struct ftrace_graph_ent trace;
+ if (unlikely(ftrace_graph_is_dead()))
+ return;
+
if (unlikely(atomic_read(&current->tracing_graph_pause)))
return;