forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'linus' into sched/devel

Browse source
This commit is contained in:
Ingo Molnar 2008-07-13 08:50:13 +02:00
commit 54ef76f37b
136 changed files with 2317 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/sched.c
View file

@ -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;
}