diff --git a/[refs] b/[refs] index 2228b57c4319..7fbf8aeb72b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b9508f6831e10d53256825de8904caa22d1ca2c +refs/heads/master: fd210738f6601d0fb462df9a2fe5a41896ff6a8f diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index da87385683cc..e4d4483fd617 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1389,6 +1389,8 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag if (candidate == -1 || candidate == cpu) { for_each_cpu(i, sched_domain_span(tmp)) { + if (!cpumask_test_cpu(i, &p->cpus_allowed)) + continue; if (!cpu_rq(i)->cfs.nr_running) { candidate = i; break;