Commit-ID: af75d1a9a9f75bf030c2f35705f1ff6d226f96fe Gitweb: https://git.kernel.org/tip/af75d1a9a9f75bf030c2f35705f1ff6d226f96fe Author: Dietmar Eggemann <dietmar.eggem...@arm.com> AuthorDate: Mon, 27 May 2019 07:21:15 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Mon, 3 Jun 2019 11:49:41 +0200
sched/fair: Remove sgs->sum_weighted_load Since sg_lb_stats::sum_weighted_load is now identical with sg_lb_stats::group_load remove it and replace its use case (calculating load per task) with the latter. Signed-off-by: Dietmar Eggemann <dietmar.eggem...@arm.com> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Acked-by: Rik van Riel <r...@surriel.com> Acked-by: Vincent Guittot <vincent.guit...@linaro.org> Cc: Frederic Weisbecker <fweis...@gmail.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Morten Rasmussen <morten.rasmus...@arm.com> Cc: Patrick Bellasi <patrick.bell...@arm.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Quentin Perret <quentin.per...@arm.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Valentin Schneider <valentin.schnei...@arm.com> Link: https://lkml.kernel.org/r/20190527062116.11512-7-dietmar.eggem...@arm.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- kernel/sched/fair.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 5b9691e5ea59..7f8d477f90fe 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7577,7 +7577,6 @@ static unsigned long task_h_load(struct task_struct *p) struct sg_lb_stats { unsigned long avg_load; /*Avg load across the CPUs of the group */ unsigned long group_load; /* Total load over the CPUs of the group */ - unsigned long sum_weighted_load; /* Weighted load of group's tasks */ unsigned long load_per_task; unsigned long group_capacity; unsigned long group_util; /* Total utilization of the group */ @@ -7944,7 +7943,6 @@ static inline void update_sg_lb_stats(struct lb_env *env, sgs->nr_numa_running += rq->nr_numa_running; sgs->nr_preferred_running += rq->nr_preferred_running; #endif - sgs->sum_weighted_load += weighted_cpuload(rq); /* * No need to call idle_cpu() if nr_running is not 0 */ @@ -7963,7 +7961,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, sgs->avg_load = (sgs->group_load*SCHED_CAPACITY_SCALE) / sgs->group_capacity; if (sgs->sum_nr_running) - sgs->load_per_task = sgs->sum_weighted_load / sgs->sum_nr_running; + sgs->load_per_task = sgs->group_load / sgs->sum_nr_running; sgs->group_weight = group->group_weight;
