From: Dinh Nguyen Date: Tue, 27 Jun 2023 22:14:30 +0000 (-0500) Subject: Revert "nios2: Convert __pte_free_tlb() to use ptdescs" X-Git-Tag: v6.6.7~2566 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ae612299621b5ae76bec55cc92503b6ed3f554b;p=platform%2Fkernel%2Flinux-starfive.git Revert "nios2: Convert __pte_free_tlb() to use ptdescs" This reverts commit 6ebe94baa2b9ddf3ccbb7f94df6ab26234532734. The patch "nios2: Convert __pte_free_tlb() to use ptdescs" was supposed to go together with a patchset that Vishal Moola had planned taking it through the mm tree. By just having this patch, all NIOS2 builds are broken. Signed-off-by: Dinh Nguyen Signed-off-by: Linus Torvalds --- diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h index ce6bb8e..ecd1657 100644 --- a/arch/nios2/include/asm/pgalloc.h +++ b/arch/nios2/include/asm/pgalloc.h @@ -28,10 +28,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, extern pgd_t *pgd_alloc(struct mm_struct *mm); -#define __pte_free_tlb(tlb, pte, addr) \ - do { \ - pagetable_pte_dtor(page_ptdesc(pte)); \ - tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \ +#define __pte_free_tlb(tlb, pte, addr) \ + do { \ + pgtable_pte_page_dtor(pte); \ + tlb_remove_page((tlb), (pte)); \ } while (0) #endif /* _ASM_NIOS2_PGALLOC_H */