Commit 6432ed64 authored Dec 23, 2009 by Linus Torvalds

Merge branch 'sched-fixes-for-linus' of...

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Revert 738d2be4, simplify set_task_cpu()

parents 94e5165a 0c69774e

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