From f4060995e4a0f8e7ff413b2890bd649e97b6136a Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Wed, 25 Mar 2009 20:55:00 -0400
Subject: [PATCH] --- yaml --- r: 142775 b: refs/heads/master c:
 5ac9f62267dc92c7735c642a5942d9e6c1190308 h: refs/heads/master i:   142773:
 b7df4730a15598772603dc1243272ddeec51cf0b   142771:
 adde71e810ec49ed378a14b2650c44cdc7d62207   142767:
 bf2b500fad7ae32a684880919ac0ec1cdbb49b16 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/ftrace.h    | 8 ++++++--
 trunk/include/linux/init_task.h | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 850fa8c967a9..3e8494d51ede 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f0c6c03c5fee91c02c696bc9bf4c0d41392abe7
+refs/heads/master: 5ac9f62267dc92c7735c642a5942d9e6c1190308
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index 015a3d22cf74..da5405dce347 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -356,6 +356,9 @@ struct ftrace_graph_ret {
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
 
+/* for init task */
+#define INIT_FTRACE_GRAPH		.ret_stack = NULL
+
 /*
  * Stack of return addresses for functions
  * of a thread.
@@ -430,10 +433,11 @@ static inline void unpause_graph_tracing(void)
 {
 	atomic_dec(&current->tracing_graph_pause);
 }
-#else
+#else /* !CONFIG_FUNCTION_GRAPH_TRACER */
 
 #define __notrace_funcgraph
 #define __irq_entry
+#define INIT_FTRACE_GRAPH
 
 static inline void ftrace_graph_init_task(struct task_struct *t) { }
 static inline void ftrace_graph_exit_task(struct task_struct *t) { }
@@ -445,7 +449,7 @@ static inline int task_curr_ret_stack(struct task_struct *tsk)
 
 static inline void pause_graph_tracing(void) { }
 static inline void unpause_graph_tracing(void) { }
-#endif
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
 
 #ifdef CONFIG_TRACING
 #include <linux/sched.h>
diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h
index e752d973fa21..cada05447bc8 100644
--- a/trunk/include/linux/init_task.h
+++ b/trunk/include/linux/init_task.h
@@ -5,6 +5,7 @@
 #include <linux/irqflags.h>
 #include <linux/utsname.h>
 #include <linux/lockdep.h>
+#include <linux/ftrace.h>
 #include <linux/ipc.h>
 #include <linux/pid_namespace.h>
 #include <linux/user_namespace.h>
@@ -184,6 +185,7 @@ extern struct cred init_cred;
 	INIT_IDS							\
 	INIT_TRACE_IRQFLAGS						\
 	INIT_LOCKDEP							\
+	INIT_FTRACE_GRAPH						\
 }