summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-25 10:32:48 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-07-18 13:56:57 -0400
commit7fa322dba30ced1a357d53abb4ade5535e4e24fc (patch)
tree90dcd684aa48f6280d568eb69c0f2ac8f138631a /arch/sh
parent96d4f43e3d012824f7e61920a340a1c03b6aacb0 (diff)
downloadop-kernel-dev-7fa322dba30ced1a357d53abb4ade5535e4e24fc.zip
op-kernel-dev-7fa322dba30ced1a357d53abb4ade5535e4e24fc.tar.gz
sh: 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. Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/ftrace.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c
index 3c74f53..079d70e 100644
--- a/arch/sh/kernel/ftrace.c
+++ b/arch/sh/kernel/ftrace.c
@@ -344,6 +344,9 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
struct ftrace_graph_ent trace;
unsigned long return_hooker = (unsigned long)&return_to_handler;
+ if (unlikely(ftrace_graph_is_dead()))
+ return;
+
if (unlikely(atomic_read(&current->tracing_graph_pause)))
return;
OpenPOWER on IntegriCloud