On 6/14/23 04:30, Geert Uytterhoeven wrote:

Hi Dinh,

On Wed, Jun 14, 2023 at 12:17 AM Dinh Nguyen [off-list ref] wrote:

quoted

On 6/12/23 16:04, Vishal Moola (Oracle) wrote:

quoted

Part of the conversions to replace pgtable constructor/destructors with
ptdesc equivalents.

Signed-off-by: Vishal Moola (Oracle) <redacted>
---
   arch/nios2/include/asm/pgalloc.h | 8 ++++----
   1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/nios2/include/asm/pgalloc.h b/arch/nios2/include/asm/pgalloc.h
index ecd1657bb2ce..ce6bb8e74271 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 {                                                    \
-             pgtable_pte_page_dtor(pte);                     \
-             tlb_remove_page((tlb), (pte));                  \
+#define __pte_free_tlb(tlb, pte, addr)                                       \
+     do {                                                            \
+             pagetable_pte_dtor(page_ptdesc(pte));                   \
+             tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte)));      \
       } while (0)

   #endif /* _ASM_NIOS2_PGALLOC_H */

Applied!

I don't think you can just apply this patch, as the new functions
were only introduced in [PATCH v4 05/34] of this series.

Ah, thanks for the pointer!

Dinh