From 554b15eee40c4297f8b73c0603f3cc80eaf7bf08 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 18 Feb 2009 01:09:07 +0100
Subject: [PATCH] --- yaml --- r: 140768 b: refs/heads/master c:
 ac07bcaa8259841905ead3f8cd60b1923ca6c0e5 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/trace/ftrace.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7c7b15320f2e..83cb14b6c94d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35ebf1caa4854ad5ba25f3a72967acc064147994
+refs/heads/master: ac07bcaa8259841905ead3f8cd60b1923ca6c0e5
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 330a059f6ed7..7dd5a2bef9cd 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -2564,7 +2564,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
 static int start_graph_tracing(void)
 {
 	struct ftrace_ret_stack **ret_stack_list;
-	int ret;
+	int ret, cpu;
 
 	ret_stack_list = kmalloc(FTRACE_RETSTACK_ALLOC_SIZE *
 				sizeof(struct ftrace_ret_stack *),
@@ -2573,6 +2573,10 @@ static int start_graph_tracing(void)
 	if (!ret_stack_list)
 		return -ENOMEM;
 
+	/* The cpu_boot init_task->ret_stack will never be freed */
+	for_each_online_cpu(cpu)
+		ftrace_graph_init_task(idle_task(cpu));
+
 	do {
 		ret = alloc_retstack_tasklist(ret_stack_list);
 	} while (ret == -EAGAIN);