diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 14:41:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 14:41:17 +0200 |
| commit | 86665c75da41889f92b774f31ea5a9a436f392a8 (patch) | |
| tree | 94b003ab677a64b7d0a6dcca1f636bbbc2a187c9 /include/linux/init_task.h | |
| parent | 93776a8ec746cf9d32c36e5a5b23d28d8be28826 (diff) | |
| parent | 1bbe2a83ab68e5cf8c66c372c7cb3b51910c2cfe (diff) | |
| download | linux-3.10-86665c75da41889f92b774f31ea5a9a436f392a8.tar.gz linux-3.10-86665c75da41889f92b774f31ea5a9a436f392a8.tar.bz2 linux-3.10-86665c75da41889f92b774f31ea5a9a436f392a8.zip | |
Merge branch 'tracing/urgent' into tracing/ftrace
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index af1de95e711..dcfb93337e9 100644 --- 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> @@ -185,6 +186,7 @@ extern struct cred init_cred; INIT_IDS \ INIT_TRACE_IRQFLAGS \ INIT_LOCKDEP \ + INIT_FTRACE_GRAPH \ } |