Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f267499 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman
Browse files

sh/tlb: Fix PGTABLE_LEVELS > 2 



[ Upstream commit c7bcbc8ab9cb20536b8f50c62a48cebda965fdba ]

Geert reported that his SH7722-based Migo-R board failed to boot after
commit:

  c5b27a88 ("sh/tlb: Convert SH to generic mmu_gather")

That commit fell victim to copying the wrong pattern --
__pmd_free_tlb() used to be implemented with pmd_free().

Fixes: c5b27a88 ("sh/tlb: Convert SH to generic mmu_gather")
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 222dbeca

arch/sh/include/asm/pgalloc.h

+1 −9
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); 
extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);

extern pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address);

extern void pmd_free(struct mm_struct *mm, pmd_t *pmd);

#define __pmd_free_tlb(tlb, pmdp, addr)		pmd_free((tlb)->mm, (pmdp))

#endif



static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
@@ -33,13 +34,4 @@ do { \ 
	tlb_remove_page((tlb), (pte));			\

} while (0)



#if CONFIG_PGTABLE_LEVELS > 2

#define __pmd_free_tlb(tlb, pmdp, addr)			\

do {							\

	struct page *page = virt_to_page(pmdp);		\

	pgtable_pmd_page_dtor(page);			\

	tlb_remove_page((tlb), page);			\

} while (0);

#endif



#endif /* __ASM_SH_PGALLOC_H */