Move source tree closer to the 2.6.32.17 mainline
/kernel/trace/ftrace.c
blob:6dc4e5ef7a01aab7e92479455c3672ce6096461c -> blob:0cccb6c460da74d4f8e03214002baf41b8577ca9
--- kernel/trace/ftrace.c
+++ kernel/trace/ftrace.c
@@ -3258,6 +3258,7 @@ void ftrace_graph_init_task(struct task_
{
/* Make sure we do not use the parent ret_stack */
t->ret_stack = NULL;
+ t->curr_ret_stack = -1;
if (ftrace_graph_active) {
struct ftrace_ret_stack *ret_stack;
@@ -3267,7 +3268,6 @@ void ftrace_graph_init_task(struct task_
GFP_KERNEL);
if (!ret_stack)
return;
- t->curr_ret_stack = -1;
atomic_set(&t->tracing_graph_pause, 0);
atomic_set(&t->trace_overrun, 0);
t->ftrace_timestamp = 0;