From 40dd81e34c87459f291752280d8d4cf2c6d7f196 Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Tue, 8 Nov 2022 09:03:55 -0800 Subject: [PATCH] Revert "ANDROID: Make MGLRU aware of speculative faults" This reverts commit 88e4dbaf592d8d9081837c9fef51335d0589354a. Will be re-added after MGLRU upstream merge. Bug: 249601646 Change-Id: I049e95f316097f2db63bd6fadb3cedca3b6f4af9 Signed-off-by: Kalesh Singh --- mm/memory.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index daf2b1a081f3..60967daa0a63 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4914,10 +4914,6 @@ static inline void mm_account_fault(struct pt_regs *regs, else perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address); } - -static void lru_gen_enter_fault(struct vm_area_struct *vma); -static void lru_gen_exit_fault(void); - #ifdef CONFIG_SPECULATIVE_PAGE_FAULT #ifndef CONFIG_ARCH_HAS_PTE_SPECIAL @@ -5110,9 +5106,7 @@ static vm_fault_t ___handle_speculative_fault(struct mm_struct *mm, } mem_cgroup_enter_user_fault(); - lru_gen_enter_fault(vmf.vma); ret = handle_pte_fault(&vmf); - lru_gen_exit_fault(); mem_cgroup_exit_user_fault(); if (ret != VM_FAULT_RETRY) {