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 bcc22b569ee9..8402944f715b 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -5622,10 +5622,10 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu) | |||
| 5622 | double_rq_lock(rq_src, rq_dest); | 5622 | double_rq_lock(rq_src, rq_dest); |
| 5623 | /* Already moved. */ | 5623 | /* Already moved. */ |
| 5624 | if (task_cpu(p) != src_cpu) | 5624 | if (task_cpu(p) != src_cpu) |
| 5625 | goto out; | 5625 | goto done; |
| 5626 | /* Affinity changed (again). */ | 5626 | /* Affinity changed (again). */ |
| 5627 | if (!cpu_isset(dest_cpu, p->cpus_allowed)) | 5627 | if (!cpu_isset(dest_cpu, p->cpus_allowed)) |
| 5628 | goto out; | 5628 | goto fail; |
| 5629 | 5629 | ||
| 5630 | on_rq = p->se.on_rq; | 5630 | on_rq = p->se.on_rq; |
| 5631 | if (on_rq) | 5631 | if (on_rq) |
| @@ -5636,8 +5636,9 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu) | |||
| 5636 | activate_task(rq_dest, p, 0); | 5636 | activate_task(rq_dest, p, 0); |
| 5637 | check_preempt_curr(rq_dest, p); | 5637 | check_preempt_curr(rq_dest, p); |
| 5638 | } | 5638 | } |
| 5639 | done: | ||
| 5639 | ret = 1; | 5640 | ret = 1; |
| 5640 | out: | 5641 | fail: |
| 5641 | double_rq_unlock(rq_src, rq_dest); | 5642 | double_rq_unlock(rq_src, rq_dest); |
| 5642 | return ret; | 5643 | return ret; |
| 5643 | } | 5644 | } |
