|
@@ -2363,7 +2363,7 @@ static inline long calc_tg_weight(struct task_group *tg, struct cfs_rq *cfs_rq)
|
|
*/
|
|
*/
|
|
tg_weight = atomic_long_read(&tg->load_avg);
|
|
tg_weight = atomic_long_read(&tg->load_avg);
|
|
tg_weight -= cfs_rq->tg_load_avg_contrib;
|
|
tg_weight -= cfs_rq->tg_load_avg_contrib;
|
|
- tg_weight += cfs_rq_load_avg(cfs_rq);
|
|
|
|
|
|
+ tg_weight += cfs_rq->load.weight;
|
|
|
|
|
|
return tg_weight;
|
|
return tg_weight;
|
|
}
|
|
}
|
|
@@ -2373,7 +2373,7 @@ static long calc_cfs_shares(struct cfs_rq *cfs_rq, struct task_group *tg)
|
|
long tg_weight, load, shares;
|
|
long tg_weight, load, shares;
|
|
|
|
|
|
tg_weight = calc_tg_weight(tg, cfs_rq);
|
|
tg_weight = calc_tg_weight(tg, cfs_rq);
|
|
- load = cfs_rq_load_avg(cfs_rq);
|
|
|
|
|
|
+ load = cfs_rq->load.weight;
|
|
|
|
|
|
shares = (tg->shares * load);
|
|
shares = (tg->shares * load);
|
|
if (tg_weight)
|
|
if (tg_weight)
|