diff --git a/[refs] b/[refs] index 9bb36088022c..c80778d86e55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3df0fc5b2e9d8092dcaeb5ae0b6753d85c851d66 +refs/heads/master: 70f1120527797adb31c68bdc6f1b45e182c342c7 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 7ffde2ae7868..87f1f47beffe 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2346,7 +2346,7 @@ int select_task_rq(struct task_struct *p, int sd_flags, int wake_flags) * not worry about this generic constraint ] */ if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) || - !cpu_active(cpu))) + !cpu_online(cpu))) cpu = select_fallback_rq(task_cpu(p), p); return cpu;