From: Gayatri Vasudevan Date: Mon, 27 Nov 2017 22:43:16 +0000 (-0800) Subject: Replace max_t() with sub_positive() in dequeue_entity_load_avg() X-Git-Tag: v4.1.12-124.31.3~1482 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1ad63999d741010aa1ddbf551ed5c517ed6d2a05;p=users%2Fjedix%2Flinux-maple.git Replace max_t() with sub_positive() in dequeue_entity_load_avg() Orabug: 27026563 This patch replaces max_t() with sub_positive() to prevent intermediate values getting stored in cfs_rq->runnable_load_avg/runnable_load_sum. This patch has been partially cherry picked from commit c7b50216818e ("sched/fair: Remove se->load.weight from se->avg.load_sum") Signed-off-by: Gayatri Vasudevan Reviewed-by: Aruna Ramakrishna --- diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index daca92d9cbb5..e25be521f06f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2748,10 +2748,8 @@ dequeue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) { update_load_avg(se, 1); - cfs_rq->runnable_load_avg = - max_t(long, cfs_rq->runnable_load_avg - se->avg.load_avg, 0); - cfs_rq->runnable_load_sum = - max_t(s64, cfs_rq->runnable_load_sum - se->avg.load_sum, 0); + sub_positive(&cfs_rq->runnable_load_avg, se->avg.load_avg); + sub_positive(&cfs_rq->runnable_load_sum, se->avg.load_sum); } /*