[tip:sched/urgent] sched: Revert 738d2be, simplify set_task_cpu()

[tip-bot for Peter Zijlstra]

Commit-ID:  0c69774e6ce94364cfaa8bdeb18061edc414bc5a
Gitweb:     http://git.kernel.org/tip/0c69774e6ce94364cfaa8bdeb18061edc414bc5a
Author:     Peter Zijlstra <peterz@xxxxxxxxxxxxx>
AuthorDate: Tue, 22 Dec 2009 15:43:19 +0100
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 23 Dec 2009 10:04:10 +0100

sched: Revert 738d2be, simplify set_task_cpu()

Effectively reverts 738d2be4301007f054541c5c4bf7fb6a361c9b3a.

As demonstrated by Eric, we really need to call __set_task_cpu()
early in the fork() path to properly initialize the various task
state -- specifically the cgroup state through set_task_rq().

[ we could probably fix this by explicitly calling
  __set_task_cpu() from   sched_fork(), but lets try that for the
  next cycle and simply revert to the old behaviour for now. ]

Reported-by: Eric Paris <eparis@xxxxxxxxxx>
Tested-by: Eric Paris <eparis@xxxxxxxxxx>,
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: efault@xxxxxx
LKML-Reference: <1261492999.4937.36.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 kernel/sched.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index 87f1f47..c535cc4 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2045,11 +2045,10 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 
 	trace_sched_migrate_task(p, new_cpu);
 
-	if (task_cpu(p) == new_cpu)
-		return;
-
-	p->se.nr_migrations++;
-	perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 1, NULL, 0);
+	if (task_cpu(p) != new_cpu) {
+		p->se.nr_migrations++;
+		perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 1, NULL, 0);
+	}
 
 	__set_task_cpu(p, new_cpu);
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/