1 files changed, 12 insertions, 15 deletions

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index b1342c5d37c..616b135c9eb 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -212,13 +212,11 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
         int cpu;
         int pc;
 
-        if (unlikely(!tr))
-                return 0;
-
         if (!ftrace_trace_task(current))
                 return 0;
 
-        if (!ftrace_graph_addr(trace->func))
+        /* trace it when it is-nested-in or is a function enabled. */
+        if (!(trace->depth || ftrace_graph_addr(trace->func)))
                 return 0;
 
         local_irq_save(flags);
@@ -231,9 +229,6 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
         } else {
                 ret = 0;
         }
-        /* Only do the atomic if it is not already set */
-        if (!test_tsk_trace_graph(current))
-                set_tsk_trace_graph(current);
 
         atomic_dec(&data->disabled);
         local_irq_restore(flags);
@@ -281,17 +276,24 @@ void trace_graph_return(struct ftrace_graph_ret *trace)
                 pc = preempt_count();
                 __trace_graph_return(tr, trace, flags, pc);
         }
-        if (!trace->depth)
-                clear_tsk_trace_graph(current);
         atomic_dec(&data->disabled);
         local_irq_restore(flags);
 }
 
+void set_graph_array(struct trace_array *tr)
+{
+        graph_array = tr;
+
+        /* Make graph_array visible before we start tracing */
+
+        smp_mb();
+}
+
 static int graph_trace_init(struct trace_array *tr)
 {
         int ret;
 
-        graph_array = tr;
+        set_graph_array(tr);
         ret = register_ftrace_graph(&trace_graph_return,
                                     &trace_graph_entry);
         if (ret)
@@ -301,11 +303,6 @@ static int graph_trace_init(struct trace_array *tr)
         return 0;
 }
 
-void set_graph_array(struct trace_array *tr)
-{
-        graph_array = tr;
-}
-
 static void graph_trace_reset(struct trace_array *tr)
 {
         tracing_stop_cmdline_record();