diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 827c1b416da6..d16c8d9fbd8b 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) | |||
5810 | double_rq_lock(rq_src, rq_dest); | 5810 | double_rq_lock(rq_src, rq_dest); |
5811 | /* Already moved. */ | 5811 | /* Already moved. */ |
5812 | if (task_cpu(p) != src_cpu) | 5812 | if (task_cpu(p) != src_cpu) |
5813 | goto out; | 5813 | goto done; |
5814 | /* Affinity changed (again). */ | 5814 | /* Affinity changed (again). */ |
5815 | if (!cpu_isset(dest_cpu, p->cpus_allowed)) | 5815 | if (!cpu_isset(dest_cpu, p->cpus_allowed)) |
5816 | goto out; | 5816 | goto fail; |
5817 | 5817 | ||
5818 | on_rq = p->se.on_rq; | 5818 | on_rq = p->se.on_rq; |
5819 | if (on_rq) | 5819 | if (on_rq) |
@@ -5824,8 +5824,9 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu) | |||
5824 | activate_task(rq_dest, p, 0); | 5824 | activate_task(rq_dest, p, 0); |
5825 | check_preempt_curr(rq_dest, p); | 5825 | check_preempt_curr(rq_dest, p); |
5826 | } | 5826 | } |
5827 | done: | ||
5827 | ret = 1; | 5828 | ret = 1; |
5828 | out: | 5829 | fail: |
5829 | double_rq_unlock(rq_src, rq_dest); | 5830 | double_rq_unlock(rq_src, rq_dest); |
5830 | return ret; | 5831 | return ret; |
5831 | } | 5832 | } |