Merge commit 'v2.6.30-rc1' into perfcounters/core

[mv-sheeva.git] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index ca226a91abeeadeb2e66da5497c226daee4b031a..c98866102817ed8e163ea128d8a25332e9656401 100644 (file)
--- a/include/linux/init_task.h
+++ b/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>
@@ -195,9 +196,10 @@ extern struct cred init_cred;
        },                                                              \
        .dirties = INIT_PROP_LOCAL_SINGLE(dirties),                     \
        INIT_IDS                                                        \
+       INIT_PERF_COUNTERS(tsk)                                         \
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
-       INIT_PERF_COUNTERS(tsk)                                         \
+       INIT_FTRACE_GRAPH                                               \
 }