sched/core: Remove unnecessary unlikely() in push_*_task()

WARN_ON() already contains an unlikely(), so it's not necessary to
use WARN_ON(1).

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20181103172602.1917-1-tiny.windzz@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index b32bc1f7cd144a73ba5aea30751fd32daeeca040..fb8b7b5d745d69d72013ab7732dae6e83882e690 100644 (file)
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -2042,10 +2042,8 @@ static int push_dl_task(struct rq *rq)
                return 0;
 
 retry:
-       if (unlikely(next_task == rq->curr)) {
-               WARN_ON(1);
+       if (WARN_ON(next_task == rq->curr))
                return 0;
-       }
 
        /*
         * If next_task preempts rq->curr, and rq->curr

diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 9aa3287ce30159554a2003657a91751f6dae6df4..e4f398ad9e73b778099cba7cd51553aea46bc6e0 100644 (file)
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1813,10 +1813,8 @@ static int push_rt_task(struct rq *rq)
                return 0;
 
 retry:
-       if (unlikely(next_task == rq->curr)) {
-               WARN_ON(1);
+       if (WARN_ON(next_task == rq->curr))
                return 0;
-       }
 
        /*
         * It's possible that the next_task slipped in of