diff options
Diffstat (limited to 'kernel/sched')
-rw-r--r-- | kernel/sched/deadline.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 46167899d852..5285332392d5 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c | |||
@@ -540,7 +540,7 @@ again: | |||
540 | dl_se->dl_yielded = 0; | 540 | dl_se->dl_yielded = 0; |
541 | if (task_on_rq_queued(p)) { | 541 | if (task_on_rq_queued(p)) { |
542 | enqueue_task_dl(rq, p, ENQUEUE_REPLENISH); | 542 | enqueue_task_dl(rq, p, ENQUEUE_REPLENISH); |
543 | if (task_has_dl_policy(rq->curr)) | 543 | if (dl_task(rq->curr)) |
544 | check_preempt_curr_dl(rq, p, 0); | 544 | check_preempt_curr_dl(rq, p, 0); |
545 | else | 545 | else |
546 | resched_curr(rq); | 546 | resched_curr(rq); |
@@ -1626,8 +1626,12 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p) | |||
1626 | /* Only reschedule if pushing failed */ | 1626 | /* Only reschedule if pushing failed */ |
1627 | check_resched = 0; | 1627 | check_resched = 0; |
1628 | #endif /* CONFIG_SMP */ | 1628 | #endif /* CONFIG_SMP */ |
1629 | if (check_resched && task_has_dl_policy(rq->curr)) | 1629 | if (check_resched) { |
1630 | check_preempt_curr_dl(rq, p, 0); | 1630 | if (dl_task(rq->curr)) |
1631 | check_preempt_curr_dl(rq, p, 0); | ||
1632 | else | ||
1633 | resched_curr(rq); | ||
1634 | } | ||
1631 | } | 1635 | } |
1632 | } | 1636 | } |
1633 | 1637 | ||