1 files changed, 10 insertions, 9 deletions

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index be530e40ceb9..74fa2c210b6d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4284,6 +4284,7 @@ static int wake_wide(struct task_struct *p)
 static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
 {
         s64 this_load, load;
+        s64 this_eff_load, prev_eff_load;
         int idx, this_cpu, prev_cpu;
         struct task_group *tg;
         unsigned long weight;
@@ -4327,21 +4328,21 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
          * Otherwise check if either cpus are near enough in load to allow this
          * task to be woken on this_cpu.
          */
-        if (this_load > 0) {
-                s64 this_eff_load, prev_eff_load;
+        this_eff_load = 100;
+        this_eff_load *= capacity_of(prev_cpu);
+
+        prev_eff_load = 100 + (sd->imbalance_pct - 100) / 2;
+        prev_eff_load *= capacity_of(this_cpu);
 
-                this_eff_load = 100;
-                this_eff_load *= capacity_of(prev_cpu);
+        if (this_load > 0) {
                 this_eff_load *= this_load +
                         effective_load(tg, this_cpu, weight, weight);
 
-                prev_eff_load = 100 + (sd->imbalance_pct - 100) / 2;
-                prev_eff_load *= capacity_of(this_cpu);
                 prev_eff_load *= load + effective_load(tg, prev_cpu, 0, weight);
+        }
+
+        balanced = this_eff_load <= prev_eff_load;
 
-                balanced = this_eff_load <= prev_eff_load;
-        } else
-                balanced = true;
         schedstat_inc(p, se.statistics.nr_wakeups_affine_attempts);
 
         if (!balanced)