[PATCH v2 06/11] sched: clean up source_load/target_load

[Alex Shi]

Don't need 'rq' variable now.

Signed-off-by: Alex Shi <alex....@linaro.org>
---
 kernel/sched/fair.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index a85a10b..2da0e3b 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3954,13 +3954,7 @@ static unsigned long weighted_cpuload(const int cpu)
  */
 static unsigned long source_load(int cpu)
 {
-       struct rq *rq = cpu_rq(cpu);
-       unsigned long total = weighted_cpuload(cpu);
-
-       if (!sched_feat(LB_BIAS))
-               return total;
-
-       return min(rq->cpu_load, total);
+       return weighted_cpuload(cpu);
 }
 
 /*
@@ -3969,7 +3963,6 @@ static unsigned long source_load(int cpu)
  */
 static unsigned long target_load(int cpu, int imbalance_pct)
 {
-       struct rq *rq = cpu_rq(cpu);
        unsigned long total = weighted_cpuload(cpu);
 
        if (!sched_feat(LB_BIAS))
@@ -3978,9 +3971,7 @@ static unsigned long target_load(int cpu, int 
imbalance_pct)
        /*
         * Bias target load with imbalance_pct.
         */
-       total = total * imbalance_pct / 100;
-
-       return max(rq->cpu_load, total);
+       return total * imbalance_pct / 100;
 }
 
 static unsigned long power_of(int cpu)
-- 
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/