diff options
Diffstat (limited to 'kernel/sched/rt.c')
-rw-r--r-- | kernel/sched/rt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index e8836cfc4cdb..cbd356f63883 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c | |||
@@ -1591,7 +1591,7 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p) | |||
1591 | static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu) | 1591 | static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu) |
1592 | { | 1592 | { |
1593 | if (!task_running(rq, p) && | 1593 | if (!task_running(rq, p) && |
1594 | cpumask_test_cpu(cpu, tsk_cpus_allowed(p))) | 1594 | cpumask_test_cpu(cpu, &p->cpus_allowed)) |
1595 | return 1; | 1595 | return 1; |
1596 | return 0; | 1596 | return 0; |
1597 | } | 1597 | } |
@@ -1726,8 +1726,7 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq) | |||
1726 | * Also make sure that it wasn't scheduled on its rq. | 1726 | * Also make sure that it wasn't scheduled on its rq. |
1727 | */ | 1727 | */ |
1728 | if (unlikely(task_rq(task) != rq || | 1728 | if (unlikely(task_rq(task) != rq || |
1729 | !cpumask_test_cpu(lowest_rq->cpu, | 1729 | !cpumask_test_cpu(lowest_rq->cpu, &task->cpus_allowed) || |
1730 | tsk_cpus_allowed(task)) || | ||
1731 | task_running(rq, task) || | 1730 | task_running(rq, task) || |
1732 | !rt_task(task) || | 1731 | !rt_task(task) || |
1733 | !task_on_rq_queued(task))) { | 1732 | !task_on_rq_queued(task))) { |