From 052dd413e455f18cd68df1ced21c3b2eda8994c8 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 10 Dec 2008 08:08:22 +0100
Subject: [PATCH] --- yaml --- r: 121275 b: refs/heads/master c:
 cbc34ed1ac36690f75fd272e19e7b4fc29aae5a2 h: refs/heads/master i:   121273:
 dd35dd7e1745b1e5c54bb9951a5ac3b8149274f6   121271:
 4565b63481d80fb282e47a495a1ffa9403142fda v: v3

---
 [refs]                      | 2 +-
 trunk/include/trace/boot.h  | 8 ++------
 trunk/include/trace/sched.h | 4 ++--
 trunk/kernel/sched.c        | 3 ++-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 1d870507be29..8cbf0eee0c7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da485e0cb16726797e99a595a399b9fc721b91bc
+refs/heads/master: cbc34ed1ac36690f75fd272e19e7b4fc29aae5a2
diff --git a/trunk/include/trace/boot.h b/trunk/include/trace/boot.h
index 088ea089e31d..6b54537eab02 100644
--- a/trunk/include/trace/boot.h
+++ b/trunk/include/trace/boot.h
@@ -1,10 +1,6 @@
 #ifndef _LINUX_TRACE_BOOT_H
 #define _LINUX_TRACE_BOOT_H
 
-#include <linux/module.h>
-#include <linux/kallsyms.h>
-#include <linux/init.h>
-
 /*
  * Structure which defines the trace of an initcall
  * while it is called.
@@ -13,7 +9,7 @@
  */
 struct boot_trace_call {
 	pid_t			caller;
-	char			func[KSYM_SYMBOL_LEN];
+	char			func[KSYM_NAME_LEN];
 };
 
 /*
@@ -21,7 +17,7 @@ struct boot_trace_call {
  * while it returns.
  */
 struct boot_trace_ret {
-	char			func[KSYM_SYMBOL_LEN];
+	char			func[KSYM_NAME_LEN];
 	int				result;
 	unsigned long long	duration;		/* nsecs */
 };
diff --git a/trunk/include/trace/sched.h b/trunk/include/trace/sched.h
index 9b2854abf7e2..f4549d506b16 100644
--- a/trunk/include/trace/sched.h
+++ b/trunk/include/trace/sched.h
@@ -30,8 +30,8 @@ DECLARE_TRACE(sched_switch,
 		TPARGS(rq, prev, next));
 
 DECLARE_TRACE(sched_migrate_task,
-	TPPROTO(struct rq *rq, struct task_struct *p, int dest_cpu),
-		TPARGS(rq, p, dest_cpu));
+	TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
+		TPARGS(p, orig_cpu, dest_cpu));
 
 DECLARE_TRACE(sched_process_free,
 	TPPROTO(struct task_struct *p),
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 7729c4bbc8ba..d377097572f9 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1851,6 +1851,8 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 
 	clock_offset = old_rq->clock - new_rq->clock;
 
+	trace_sched_migrate_task(p, task_cpu(p), new_cpu);
+
 #ifdef CONFIG_SCHEDSTATS
 	if (p->se.wait_start)
 		p->se.wait_start -= clock_offset;
@@ -2868,7 +2870,6 @@ static void sched_migrate_task(struct task_struct *p, int dest_cpu)
 	    || unlikely(!cpu_active(dest_cpu)))
 		goto out;
 
-	trace_sched_migrate_task(rq, p, dest_cpu);
 	/* force the process onto the specified CPU */
 	if (migrate_task(p, dest_cpu, &req)) {
 		/* Need to wait for migration thread (might exit: take ref). */