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 | |
| parent | 93776a8ec746cf9d32c36e5a5b23d28d8be28826 (diff) | |
| parent | 1bbe2a83ab68e5cf8c66c372c7cb3b51910c2cfe (diff) | |
Merge branch 'tracing/urgent' into tracing/ftrace
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ftrace.h | 8 | ||||
| -rw-r--r-- | include/linux/init_task.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 9e0a8d245e5..6aea54d2dd3 100644 --- a/include/linux/ftrace.h +++ b/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. @@ -429,10 +432,11 @@ static inline void unpause_graph_tracing(void) { atomic_dec(¤t->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) { } @@ -444,7 +448,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/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 \ } |