From: Steven Rostedt (Red Hat) Date: Wed, 25 Jun 2014 13:43:31 +0000 (-0400) Subject: microblaze: ftrace: Add call to ftrace_graph_is_dead() in function graph code X-Git-Tag: v3.17-rc1~143^2~29 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e1dc5007cf51a0a5d2e6ca6d0c81d1c987b0ac77;p=karo-tx-linux.git microblaze: 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/53C8D874.9090601@monstr.eu Tested-by: Michal Simek Signed-off-by: Steven Rostedt --- diff --git a/arch/microblaze/kernel/ftrace.c b/arch/microblaze/kernel/ftrace.c index bbcd2533766c..fc7b48a52cd5 100644 --- a/arch/microblaze/kernel/ftrace.c +++ b/arch/microblaze/kernel/ftrace.c @@ -27,6 +27,9 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) unsigned long return_hooker = (unsigned long) &return_to_handler; + if (unlikely(ftrace_graph_is_dead())) + return; + if (unlikely(atomic_read(¤t->tracing_graph_pause))) return;