Current platform specific pxdp_get() helpers are exact same as the default ones defined in the generic MM header (include/linux/pgtable.h) thus making them redundant. Move functions that are now depending on generic helpers to avoid build failure. Cc: Huacai Chen Cc: WANG Xuerui Cc: Andrew Morton Cc: loongarch@lists.linux.dev Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Signed-off-by: Anshuman Khandual --- arch/loongarch/include/asm/pgtable.h | 20 ++------------------ arch/loongarch/mm/init.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index 223528c04d739..cda4d5652d609 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -125,9 +125,6 @@ struct vm_area_struct; #endif -#define ptep_get(ptep) READ_ONCE(*(ptep)) -#define pmdp_get(pmdp) READ_ONCE(*(pmdp)) - #define pte_ERROR(e) \ pr_err("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e)) #ifndef __PAGETABLE_PMD_FOLDED @@ -371,12 +368,7 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) #endif } -static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) -{ - pte_t pte = ptep_get(ptep); - pte_val(pte) &= _PAGE_GLOBAL; - set_pte(ptep, pte); -} +void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); #define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1) #define PMD_T_LOG2 (__builtin_ffs(sizeof(pmd_t)) - 1) @@ -611,16 +603,8 @@ static inline pmd_t pmd_mkinvalid(pmd_t pmd) * different prototype. */ #define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR -static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, - unsigned long address, pmd_t *pmdp) -{ - pmd_t old = pmdp_get(pmdp); - - pmd_clear(pmdp); - - return old; -} +pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long address, pmd_t *pmdp); #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #ifdef CONFIG_NUMA_BALANCING diff --git a/arch/loongarch/mm/init.c b/arch/loongarch/mm/init.c index 3407030f3e7a2..3262dc3a2971e 100644 --- a/arch/loongarch/mm/init.c +++ b/arch/loongarch/mm/init.c @@ -255,3 +255,22 @@ struct execmem_info __init *execmem_arch_setup(void) return &execmem_info; } #endif /* CONFIG_EXECMEM && MODULES_VADDR */ + +void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) +{ + pte_t pte = ptep_get(ptep); + + pte_val(pte) &= _PAGE_GLOBAL; + set_pte(ptep, pte); +} + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long address, pmd_t *pmdp) +{ + pmd_t old = pmdp_get(pmdp); + + pmd_clear(pmdp); + + return old; +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ -- 2.43.0