aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched/deadline.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-05-12 03:18:13 -0400
committerIngo Molnar <mingo@kernel.org>2016-05-12 03:18:13 -0400
commiteb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6 (patch)
tree1b06e2c1beca8f970685eb13096c7a12480526c6 /kernel/sched/deadline.c
parent58fe9c4621b7219e724c0b7af053112f974a08c3 (diff)
parent53d3bc773eaa7ab1cf63585e76af7ee869d5e709 (diff)
Merge branch 'sched/urgent' into sched/core to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/deadline.c')
-rw-r--r--kernel/sched/deadline.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index ba53a87bb978..0ac6c84f3371 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -1395,6 +1395,7 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq)
1395 !cpumask_test_cpu(later_rq->cpu, 1395 !cpumask_test_cpu(later_rq->cpu,
1396 &task->cpus_allowed) || 1396 &task->cpus_allowed) ||
1397 task_running(rq, task) || 1397 task_running(rq, task) ||
1398 !dl_task(task) ||
1398 !task_on_rq_queued(task))) { 1399 !task_on_rq_queued(task))) {
1399 double_unlock_balance(rq, later_rq); 1400 double_unlock_balance(rq, later_rq);
1400 later_rq = NULL; 1401 later_rq = NULL;