From e76cbb48fbcdb808242af41772a4d6ed9d708fd0 Mon Sep 17 00:00:00 2001 From: xiewen3 Date: Tue, 16 May 2023 23:09:36 +0800 Subject: [PATCH] LUR: Revert "UPSTREAM: mm: add generic p?d_leaf() macros" The LRU function is not compatible with GKI, causing GKI to fail to start, so revert. This reverts commit 7159dbb11d03d5ed343be00e604b0323389bedc9. Change-Id: I033fff852c69af310709f76e817801a5e19fbe48 Reviewed-on: https://gerrit.mot.com/2609782 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- include/asm-generic/pgtable.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index f5895a174b3b..15f77361eb13 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1206,24 +1206,4 @@ static inline bool arch_has_pfn_modify_check(void) #define mm_pmd_folded(mm) __is_defined(__PAGETABLE_PMD_FOLDED) #endif -/* - * p?d_leaf() - true if this entry is a final mapping to a physical address. - * This differs from p?d_huge() by the fact that they are always available (if - * the architecture supports large pages at the appropriate level) even - * if CONFIG_HUGETLB_PAGE is not defined. - * Only meaningful when called on a valid entry. - */ -#ifndef pgd_leaf -#define pgd_leaf(x) 0 -#endif -#ifndef p4d_leaf -#define p4d_leaf(x) 0 -#endif -#ifndef pud_leaf -#define pud_leaf(x) 0 -#endif -#ifndef pmd_leaf -#define pmd_leaf(x) 0 -#endif - #endif /* _ASM_GENERIC_PGTABLE_H */