Commit f441ff73 authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

powerpc: Fix pud_mkwrite() definition after pte_mkwrite() API changes 



Fix up missed semantic mis-merge between commits

  161e393c ("mm: Make pte_mkwrite() take a VMA")
  27af67f3 ("powerpc/book3s64/mm: enable transparent pud hugepage")

where the newly introduced powerpc use of 'pte_mkwrite()' needs to use
the 'novma()' versions as per commit 2f0584f3 ("mm: Rename arch
pte_mkwrite()'s to pte_mkwrite_novma()").

Fixes: df57721f ("Merge tag 'x86_shstk_for_6.6-rc1' of [...]")
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87dfd85c

arch/powerpc/include/asm/book3s/64/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ static inline pte_t *pudp_ptep(pud_t *pud) 
#define pud_mkdirty(pud)	pte_pud(pte_mkdirty(pud_pte(pud)))

#define pud_mkclean(pud)	pte_pud(pte_mkclean(pud_pte(pud)))

#define pud_mkyoung(pud)	pte_pud(pte_mkyoung(pud_pte(pud)))

#define pud_mkwrite(pud)	pte_pud(pte_mkwrite(pud_pte(pud)))

#define pud_mkwrite(pud)	pte_pud(pte_mkwrite_novma(pud_pte(pud)))

#define pud_write(pud)		pte_write(pud_pte(pud))



#ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY