Message ID | 20180309095245.11071-4-patrick.bellasi@arm.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index dc6c8b5a24ad..5c459479593b 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2122,7 +2122,14 @@ static inline unsigned long cpu_util_dl(struct rq *rq) static inline unsigned long cpu_util_cfs(struct rq *rq) { - return rq->cfs.avg.util_avg; + unsigned long util = READ_ONCE(rq->cfs.avg.util_avg); + + if (sched_feat(UTIL_EST)) { + util = max_t(unsigned long, util, + READ_ONCE(rq->cfs.avg.util_est.enqueued)); + } + + return util; } #endif