From a281a3400d6573eaa763da21ce16438d6728414b Mon Sep 17 00:00:00 2001 From: xiewen3 Date: Tue, 16 May 2023 23:02:51 +0800 Subject: [PATCH] LUR: Revert "UPSTREAM: mm/vmscan.c: use update_lru_size() in update_lru_sizes()" The LRU function is not compatible with GKI, causing GKI to fail to start, so revert. This reverts commit 78201f9570128320c849f6a527e1a55b9e2585ed. Change-Id: I74fcb0d3720b84bc82e36f15846b3518aac136c8 Reviewed-on: https://gerrit.mot.com/2609776 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, 4 insertions(+), 1 deletion(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 3cae1a1866f1..90ef9c46e2f3 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1722,7 +1722,10 @@ 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]); + __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 } }