diff --git a/[refs] b/[refs] index c58505e7992e..12705ae26adc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1f47d891c0f00769d6d40ac5740f943e998d089 +refs/heads/master: 17b3279b48835eb522d842eae16f541da3729c8a diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c index 9becc3710b60..72c81322fb9a 100644 --- a/trunk/kernel/sched_rt.c +++ b/trunk/kernel/sched_rt.c @@ -176,7 +176,8 @@ static int select_task_rq_rt(struct task_struct *p, int sync) * that is just being woken and probably will have * cold cache anyway. */ - if (unlikely(rt_task(rq->curr))) { + if (unlikely(rt_task(rq->curr)) && + (p->nr_cpus_allowed > 1)) { int cpu = find_lowest_rq(p); return (cpu == -1) ? task_cpu(p) : cpu;