summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-13 08:50:13 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-13 08:50:13 +0200
commit54ef76f37bcccf8c16fbaaed13c3c40825195958 (patch)
tree59afdb95e68f2fbac2550aa42135921086649c38 /kernel/sched.c
parent032f82786f9be4635acaa5f77feca175a4ac5fe1 (diff)
parent9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff)
downloadop-kernel-dev-54ef76f37bcccf8c16fbaaed13c3c40825195958.zip
op-kernel-dev-54ef76f37bcccf8c16fbaaed13c3c40825195958.tar.gz
Merge branch 'linus' into sched/devel
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 827c1b4..d16c8d9 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5810,10 +5810,10 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)
double_rq_lock(rq_src, rq_dest);
/* Already moved. */
if (task_cpu(p) != src_cpu)
- goto out;
+ goto done;
/* Affinity changed (again). */
if (!cpu_isset(dest_cpu, p->cpus_allowed))
- goto out;
+ goto fail;
on_rq = p->se.on_rq;
if (on_rq)
@@ -5824,8 +5824,9 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu)
activate_task(rq_dest, p, 0);
check_preempt_curr(rq_dest, p);
}
+done:
ret = 1;
-out:
+fail:
double_rq_unlock(rq_src, rq_dest);
return ret;
}
OpenPOWER on IntegriCloud