[RFC 37/60] cosched: Use hrq_of() for (indirect calls to) ___update_load_sum()

[Jan H . Schönherr]

The cpu argument supplied to all callers of ___update_load_sum() is used
in accumulate_sum() to scale load values according to the CPU capacity.
While we should think about that at some point, it is out-of-scope for now.
Also, it does not matter on homogeneous system topologies.

Update all callers to use hrq_of() instead of rq_of() to derive the cpu
argument.

Signed-off-by: Jan H. Schönherr <jscho...@amazon.de>
---
 kernel/sched/fair.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index fde1c4ba4bb4..a2945355f823 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3114,7 +3114,7 @@ void set_task_rq_fair(struct sched_entity *se,
        p_last_update_time = prev->avg.last_update_time;
        n_last_update_time = next->avg.last_update_time;
 #endif
-       __update_load_avg_blocked_se(p_last_update_time, cpu_of(rq_of(prev)), 
se);
+       __update_load_avg_blocked_se(p_last_update_time, cpu_of(hrq_of(prev)), 
se);
        se->avg.last_update_time = n_last_update_time;
 }
 
@@ -3397,7 +3397,7 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq)
                decayed = 1;
        }
 
-       decayed |= __update_load_avg_cfs_rq(now, cpu_of(rq_of(cfs_rq)), cfs_rq);
+       decayed |= __update_load_avg_cfs_rq(now, cpu_of(hrq_of(cfs_rq)), 
cfs_rq);
 
 #ifndef CONFIG_64BIT
        smp_wmb();
@@ -3487,7 +3487,7 @@ static void detach_entity_load_avg(struct cfs_rq *cfs_rq, 
struct sched_entity *s
 static inline void update_load_avg(struct cfs_rq *cfs_rq, struct sched_entity 
*se, int flags)
 {
        u64 now = cfs_rq_clock_task(cfs_rq);
-       struct rq *rq = rq_of(cfs_rq);
+       struct rq *rq = hrq_of(cfs_rq);
        int cpu = cpu_of(rq);
        int decayed;
 
@@ -3548,7 +3548,7 @@ void sync_entity_load_avg(struct sched_entity *se)
        u64 last_update_time;
 
        last_update_time = cfs_rq_last_update_time(cfs_rq);
-       __update_load_avg_blocked_se(last_update_time, cpu_of(rq_of(cfs_rq)), 
se);
+       __update_load_avg_blocked_se(last_update_time, cpu_of(hrq_of(cfs_rq)), 
se);
 }
 
 /*
-- 
2.9.3.1.gcba166c.dirty