sched: clean up the wakeup preempt check

clean up the wakeup preemption check. No code changed:

   text    data     bss     dec     hex filename
  44227    3326      36   47589    b9e5 sched.o.before
  44227    3326      36   47589    b9e5 sched.o.after

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 13 insertions, 12 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index a3badf52bba2..d558716a9add 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -852,20 +852,21 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p)
         if (unlikely(p->policy == SCHED_BATCH))
                 return;
 
-        if (sched_feat(WAKEUP_PREEMPT)) {
-                while (!is_same_group(se, pse)) {
-                        se = parent_entity(se);
-                        pse = parent_entity(pse);
-                }
-
-                delta = se->vruntime - pse->vruntime;
-                gran = sysctl_sched_wakeup_granularity;
-                if (unlikely(se->load.weight != NICE_0_LOAD))
-                        gran = calc_delta_fair(gran, &se->load);
+        if (!sched_feat(WAKEUP_PREEMPT))
+                return;
 
-                if (delta > gran)
-                        resched_task(curr);
+        while (!is_same_group(se, pse)) {
+                se = parent_entity(se);
+                pse = parent_entity(pse);
         }
+
+        delta = se->vruntime - pse->vruntime;
+        gran = sysctl_sched_wakeup_granularity;
+        if (unlikely(se->load.weight != NICE_0_LOAD))
+                gran = calc_delta_fair(gran, &se->load);
+
+        if (delta > gran)
+                resched_task(curr);
 }
 
 static struct task_struct *pick_next_task_fair(struct rq *rq)