From ced2ac82ddd8b4253b4261c36777226c563674a0 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 23 Nov 2008 09:18:56 +0100
Subject: [PATCH] --- yaml --- r: 121174 b: refs/heads/master c:
 82f60f0bc854aada696f27d863c03bef91f1509d h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/ftrace.h | 3 +++
 trunk/kernel/exit.c          | 2 --
 trunk/kernel/fork.c          | 2 --
 trunk/kernel/sched.c         | 2 --
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3bb2596dc2e1..15e251c48b6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f201ae2356c74bcae130b2177b3dca903ea98071
+refs/heads/master: 82f60f0bc854aada696f27d863c03bef91f1509d
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index 2ba259b2defa..938ca1942641 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/include/linux/ftrace.h
@@ -335,6 +335,9 @@ extern void unregister_ftrace_return(void);
 
 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 */
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index b9d446329da1..ef04d03b3286 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -1128,9 +1128,7 @@ NORET_TYPE void do_exit(long code)
 	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".  */
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index d1eb30e69ccc..fbf4a4c0a628 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1270,9 +1270,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 	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;
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index fb17205950de..388d9db044ab 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -5901,9 +5901,7 @@ void __cpuinit init_idle(struct task_struct *idle, int cpu)
 	 * 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
 }
 
 /*