commit 82f60f0bc854aada696f27d863c03bef91f1509d
author Ingo Molnar <mingo@elte.hu> Sun Nov 23 09:18:56 2008 +0100
committer Ingo Molnar <mingo@elte.hu> Sun Nov 23 09:19:35 2008 +0100
tree 521fbccfc12f6c8a36f261b20eacbc84a4a31add
parent f201ae2356c74bcae130b2177b3dca903ea98071

tracing/function-return-tracer: clean up task start/exit callbacks

Impact: cleanup

Eliminate #ifdefs in core code by using empty inline functions.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

include/linux/ftrace.h

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 2ba259b..938ca19 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -335,6 +335,9 @@
 
 extern void ftrace_retfunc_init_task(struct task_struct *t);
 extern void ftrace_retfunc_exit_task(struct task_struct *t);
+#else
+static inline void ftrace_retfunc_init_task(struct task_struct *t) { }
+static inline void ftrace_retfunc_exit_task(struct task_struct *t) { }
 #endif
 
 #endif /* _LINUX_FTRACE_H */

kernel/exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index b9d4463..ef04d03 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1128,9 +1128,7 @@
 	preempt_disable();
 	/* causes final put_task_struct in finish_task_switch(). */
 	tsk->state = TASK_DEAD;
-#ifdef CONFIG_FUNCTION_RET_TRACER
 	ftrace_retfunc_exit_task(tsk);
-#endif
 	schedule();
 	BUG();
 	/* Avoid "noreturn function does return".  */

kernel/fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index d1eb30e..fbf4a4c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1270,9 +1270,7 @@
 	total_forks++;
 	spin_unlock(&current->sighand->siglock);
 	write_unlock_irq(&tasklist_lock);
-#ifdef CONFIG_FUNCTION_RET_TRACER
 	ftrace_retfunc_init_task(p);
-#endif
 	proc_fork_connector(p);
 	cgroup_post_fork(p);
 	return p;

kernel/sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index fb17205..388d9db 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5901,9 +5901,7 @@
 	 * The idle tasks have their own, simple scheduling class:
 	 */
 	idle->sched_class = &idle_sched_class;
-#ifdef CONFIG_FUNCTION_RET_TRACER
 	ftrace_retfunc_init_task(idle);
-#endif
 }
 
 /*