From 59492259cbe90a9a0d8a9ba2ea192b2d70480ff4 Mon Sep 17 00:00:00 2001 From: Wei Yang Date: Wed, 3 Jun 2020 16:01:12 -0700 Subject: [PATCH] UPSTREAM: mm/vmscan.c: use update_lru_size() in update_lru_sizes() We already defined the helper update_lru_size(). Let's use this to reduce code duplication. Moto-CRs-Fixed:(CR) Change-Id: Icae4274c4f4c9bdfd70355bb32eb2fe1800a79c1 Signed-off-by: Wei Yang Signed-off-by: Andrew Morton Reviewed-by: Baoquan He Reviewed-by: Andrew Morton Acked-by: Michal Hocko Link: http://lkml.kernel.org/r/20200331221550.1011-1-richard.weiyang@gmail.com Signed-off-by: Linus Torvalds (cherry picked from commit a892cb6b977ffe209683809e5e9d627656d20aa8) Bug: 261052246 Signed-off-by: Kalesh Singh Reviewed-on: https://gerrit.mot.com/2491785 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- mm/vmscan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 90ef9c46e2f3..3cae1a1866f1 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1722,10 +1722,7 @@ static __always_inline void update_lru_sizes(struct lruvec *lruvec, if (!nr_zone_taken[zid]) continue; - __update_lru_size(lruvec, lru, zid, -nr_zone_taken[zid]); -#ifdef CONFIG_MEMCG - mem_cgroup_update_lru_size(lruvec, lru, zid, -nr_zone_taken[zid]); -#endif + update_lru_size(lruvec, lru, zid, -nr_zone_taken[zid]); } }