sched/fair: check_preempt_wakeup: Fix assumption on the default policy

[deliverable/linux.git] / kernel / sched / fair.c

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 07aaa7f085974663e7716757e80b520c925d52f7..f3aef2108368eefff792fe3e9036cd910827bcbb 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5669,7 +5669,8 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
         * Batch and idle tasks do not preempt non-idle tasks (their preemption
         * is driven by the tick):
         */
-       if (unlikely(p->policy != SCHED_NORMAL) || !sched_feat(WAKEUP_PREEMPTION))
+       if (unlikely(p->policy == SCHED_BATCH || p->policy == SCHED_IDLE) ||
+                       !sched_feat(WAKEUP_PREEMPTION))
                return;
 
        find_matching_se(&se, &pse);