From f179993880b825fb08cf49d0ffcbed94e1c8a26a Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sun, 23 Nov 2008 18:43:39 +0100
Subject: [PATCH] --- yaml --- r: 121176 b: refs/heads/master c:
 65afa5e603d507014580ead016ec887b49e1afa6 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/kernel/exit.c | 2 --
 trunk/kernel/fork.c | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f34642cf5fa3..865d70564ce7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eae849ca034c7f1015f0a6f17421ebc737f0a069
+refs/heads/master: 65afa5e603d507014580ead016ec887b49e1afa6
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index ef04d03b3286..e5ae36ebe8af 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -47,7 +47,6 @@
 #include <linux/task_io_accounting_ops.h>
 #include <linux/tracehook.h>
 #include <trace/sched.h>
-#include <linux/ftrace.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -1128,7 +1127,6 @@ NORET_TYPE void do_exit(long code)
 	preempt_disable();
 	/* causes final put_task_struct in finish_task_switch(). */
 	tsk->state = TASK_DEAD;
-	ftrace_retfunc_exit_task(tsk);
 	schedule();
 	BUG();
 	/* Avoid "noreturn function does return".  */
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index fbf4a4c0a628..d6e1a3205f62 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -140,6 +140,7 @@ void free_task(struct task_struct *tsk)
 	prop_local_destroy_single(&tsk->dirties);
 	free_thread_info(tsk->stack);
 	rt_mutex_debug_task_free(tsk);
+	ftrace_retfunc_exit_task(tsk);
 	free_task_struct(tsk);
 }
 EXPORT_SYMBOL(free_task);