diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 12:12:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 12:12:57 -0500 |
| commit | 6432ed648a204d01d160990630178a1569b36852 (patch) | |
| tree | f8171068c01318883faeac903e8cc589a9c9f154 /kernel | |
| parent | 94e5165aa72826b05ffd492f334a1465187e255a (diff) | |
| parent | 0c69774e6ce94364cfaa8bdeb18061edc414bc5a (diff) | |
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.c | 9 |
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) | |||
| 2045 | 2045 | ||
| 2046 | trace_sched_migrate_task(p, new_cpu); | 2046 | trace_sched_migrate_task(p, new_cpu); |
| 2047 | 2047 | ||
| 2048 | if (task_cpu(p) == new_cpu) | 2048 | if (task_cpu(p) != new_cpu) { |
| 2049 | return; | 2049 | p->se.nr_migrations++; |
| 2050 | 2050 | perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 1, NULL, 0); | |
| 2051 | p->se.nr_migrations++; | 2051 | } |
| 2052 | perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 1, NULL, 0); | ||
| 2053 | 2052 | ||
| 2054 | __set_task_cpu(p, new_cpu); | 2053 | __set_task_cpu(p, new_cpu); |
| 2055 | } | 2054 | } |