projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'jfs-3.14' of git://github.com/kleikamp/linux-shaggy
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
sched
/
rt.c
diff --git
a/kernel/sched/rt.c
b/kernel/sched/rt.c
index 1c4065575fa2c44d91250455db38638d728788e8..a2740b775b456ed27c56ad088007c83e1873458b 100644
(file)
--- a/
kernel/sched/rt.c
+++ b/
kernel/sched/rt.c
@@
-1738,7
+1738,7
@@
static void task_woken_rt(struct rq *rq, struct task_struct *p)
!test_tsk_need_resched(rq->curr) &&
has_pushable_tasks(rq) &&
p->nr_cpus_allowed > 1 &&
-
rt_task(rq->curr
) &&
+
(dl_task(rq->curr) || rt_task(rq->curr)
) &&
(rq->curr->nr_cpus_allowed < 2 ||
rq->curr->prio <= p->prio))
push_rt_tasks(rq);