From b69665581be982d2ece064c080426006af4a666f Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Tue, 2 Jun 2009 16:51:55 -0400 Subject: [PATCH] --- yaml --- r: 146233 b: refs/heads/master c: 84047e360af0394ac5861d433f26bbcf30f77dd1 h: refs/heads/master i: 146231: 5b2f8f4ca64387b59b97488363f328d8799b9a11 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ftrace.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 23c1be7769d1..b55c8d0b5ded 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7e8b616ed1cc6f790b82324bce8a2a60295e5c2 +refs/heads/master: 84047e360af0394ac5861d433f26bbcf30f77dd1 diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index 1664d3f33d38..bb081f37cac7 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -2738,6 +2738,9 @@ void unregister_ftrace_graph(void) /* Allocate a return stack for newly created task */ void ftrace_graph_init_task(struct task_struct *t) { + /* Make sure we do not use the parent ret_stack */ + t->ret_stack = NULL; + if (atomic_read(&ftrace_graph_active)) { struct ftrace_ret_stack *ret_stack; @@ -2753,8 +2756,7 @@ void ftrace_graph_init_task(struct task_struct *t) /* make curr_ret_stack visable before we add the ret_stack */ smp_wmb(); t->ret_stack = ret_stack; - } else - t->ret_stack = NULL; + } } void ftrace_graph_exit_task(struct task_struct *t)