Merge branch 'linus' into locking/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 02004ae91860..96cea88fa00f 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -889,6 +889,10 @@ static int profile_graph_entry(struct ftrace_graph_ent *trace)
 
         function_profile_call(trace->func, 0, NULL, NULL);
 
+        /* If function graph is shutting down, ret_stack can be NULL */
+        if (!current->ret_stack)
+                return 0;
+
         if (index >= 0 && index < FTRACE_RETFUNC_DEPTH)
                 current->ret_stack[index].subtime = 0;