summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-23 09:12:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-23 09:12:57 -0800
commit6432ed648a204d01d160990630178a1569b36852 (patch)
treef8171068c01318883faeac903e8cc589a9c9f154 /kernel
parent94e5165aa72826b05ffd492f334a1465187e255a (diff)
parent0c69774e6ce94364cfaa8bdeb18061edc414bc5a (diff)
downloadlinux-6432ed648a204d01d160990630178a1569b36852.tar.gz
linux-6432ed648a204d01d160990630178a1569b36852.tar.bz2
linux-6432ed648a204d01d160990630178a1569b36852.zip
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 738d2be, simplify set_task_cpu()
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 87f1f47beffe..c535cc4f6428 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);
}