summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-14 15:15:16 +0100
committerIngo Molnar <mingo@elte.hu>2011-02-14 15:15:16 +0100
commitbf1af3a809506645b9130755b713b008da14737f (patch)
tree6a13f9c622fa8322a6ca2795bd7bb4e9f8fd6160 /include/linux
parent0de4b34d466bae571b50f41c7296b85248205e35 (diff)
parent868baf07b1a259f5f3803c1dc2777b6c358f83cf (diff)
downloadop-kernel-dev-bf1af3a809506645b9130755b713b008da14737f.zip
op-kernel-dev-bf1af3a809506645b9130755b713b008da14737f.tar.gz
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ftrace.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index dcd6a7c..ca29e03 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -428,6 +428,7 @@ extern void unregister_ftrace_graph(void);
extern void ftrace_graph_init_task(struct task_struct *t);
extern void ftrace_graph_exit_task(struct task_struct *t);
+extern void ftrace_graph_init_idle_task(struct task_struct *t, int cpu);
static inline int task_curr_ret_stack(struct task_struct *t)
{
@@ -451,6 +452,7 @@ static inline void unpause_graph_tracing(void)
static inline void ftrace_graph_init_task(struct task_struct *t) { }
static inline void ftrace_graph_exit_task(struct task_struct *t) { }
+static inline void ftrace_graph_init_idle_task(struct task_struct *t, int cpu) { }
static inline int register_ftrace_graph(trace_func_graph_ret_t retfunc,
trace_func_graph_ent_t entryfunc)
OpenPOWER on IntegriCloud