From eb19889bf22fd4a8968dcaab3b4ba5db22d2d9ab Mon Sep 17 00:00:00 2001 From: xiewen3 Date: Tue, 16 May 2023 23:10:51 +0800 Subject: [PATCH] LUR: Revert "UPSTREAM: arm64: mm: implement arch_faults_on_old_pte() on arm64" The LRU function is not compatible with GKI, causing GKI to fail to start, so revert. This reverts commit c929eb69b36f01d4920bf516f1fee4be7b4abeec. Change-Id: I1b29555391999bcdc12195cf5e3d10a21ff1af15 Reviewed-on: https://gerrit.mot.com/2609784 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- arch/arm64/include/asm/pgtable.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 30588e12752b..9197acde622a 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -886,20 +886,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, #define phys_to_ttbr(addr) (addr) #endif -/* - * On arm64 without hardware Access Flag, copying from user will fail because - * the pte is old and cannot be marked young. So we always end up with zeroed - * page after fork() + CoW for pfn mappings. We don't always have a - * hardware-managed access flag on arm64. - */ -static inline bool arch_faults_on_old_pte(void) -{ - WARN_ON(preemptible()); - - return !cpu_has_hw_af(); -} -#define arch_faults_on_old_pte arch_faults_on_old_pte - #endif /* !__ASSEMBLY__ */ #endif /* __ASM_PGTABLE_H */