Merge branch 'linus' into tracing/core

[linux-2.6-block.git] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index d87247d2641f5cbf4eb69a90fea392b95684e588..889bf99eca6d7f74eefb5c2c09f8dbc5d6885c97 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -174,6 +174,7 @@ extern struct cred init_cred;
        INIT_TRACE_IRQFLAGS                                             \
        INIT_LOCKDEP                                                    \
        INIT_FTRACE_GRAPH                                               \
+       INIT_TRACE_RECURSION                                            \
 }