From f8a0095395a7b88c0c2ff61809dbab53ab8bec0d Mon Sep 17 00:00:00 2001 From: xiewen3 Date: Tue, 16 May 2023 23:00:56 +0800 Subject: [PATCH] LUR: Revert "BACKPORT: mm: remove superfluous __ClearPageActive()" The LRU function is not compatible with GKI, causing GKI to fail to start, so revert. This reverts commit 5f225d9450f42612a0056e7fec13cfe5e828caac. Change-Id: Ic0e6dca9a27428421d8ad29517a497133138ee3b Reviewed-on: https://gerrit.mot.com/2609774 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- mm/memremap.c | 2 ++ mm/swap.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mm/memremap.c b/mm/memremap.c index b268b184eab3..c51c6bd2fe34 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -419,6 +419,8 @@ void __put_devmap_managed_page(struct page *page) * holds a reference on the page. */ if (count == 1) { + /* Clear Active bit in case of parallel mark_page_accessed */ + __ClearPageActive(page); __ClearPageWaiters(page); mem_cgroup_uncharge(page); diff --git a/mm/swap.c b/mm/swap.c index 8362cfde85aa..159174565497 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -829,6 +829,8 @@ void release_pages(struct page **pages, int nr) del_page_from_lru_list(page, lruvec, page_off_lru(page)); } + /* Clear Active bit in case of parallel mark_page_accessed */ + __ClearPageActive(page); __ClearPageWaiters(page); list_add(&page->lru, &pages_to_free);