From 6ec3a670bf43a47037ce87f93809c743885885bf Mon Sep 17 00:00:00 2001 From: xiewen3 Date: Tue, 16 May 2023 23:07:59 +0800 Subject: [PATCH] LUR: Revert "UPSTREAM: arm64: mm: add p?d_leaf() definitions" The LRU function is not compatible with GKI, causing GKI to fail to start, so revert. This reverts commit 5f9995fba5dfa040728619437610119360f64ccd. Change-Id: I4a0dfd382d738cbd18513d71ed9250b60c7349df Reviewed-on: https://gerrit.mot.com/2609781 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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index d3c05457377b..30588e12752b 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -455,7 +455,6 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, PMD_TYPE_TABLE) #define pmd_sect(pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_SECT) -#define pmd_leaf(pmd) pmd_sect(pmd) #if defined(CONFIG_ARM64_64K_PAGES) || CONFIG_PGTABLE_LEVELS < 3 static inline bool pud_sect(pud_t pud) { return false; } @@ -547,7 +546,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) #define pud_none(pud) (!pud_val(pud)) #define pud_bad(pud) (!(pud_val(pud) & PUD_TABLE_BIT)) #define pud_present(pud) pte_present(pud_pte(pud)) -#define pud_leaf(pud) pud_sect(pud) #define pud_valid(pud) pte_valid(pud_pte(pud)) static inline void set_pud(pud_t *pudp, pud_t pud)