Commit 0c69774e authored Dec 22, 2009 by Peter Zijlstra Committed by Ingo Molnar Dec 23, 2009

sched: Revert 738d2be4, simplify set_task_cpu()



Effectively reverts 738d2be4.

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@redhat.com>
Tested-by: Eric Paris <eparis@redhat.com&gt;,>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: efault@gmx.de
LKML-Reference: <1261492999.4937.36.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent f7b84a6b

kernel/sched.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -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;

		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);
		}

Admin message