Merge tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[deliverable/linux.git] / arch / microblaze / kernel / ftrace.c

diff --git a/arch/microblaze/kernel/ftrace.c b/arch/microblaze/kernel/ftrace.c
index bbcd2533766cbf95928cf125219d53fcba70f3be..fc7b48a52cd554c74be87e2185f7594c68c20beb 100644 (file)
--- 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(&current->tracing_graph_pause)))
                return;