powerpc: Fix pud_mkwrite() definition after pte_mkwrite() API changes
authorIngo Molnar <mingo@kernel.org>
Thu, 31 Aug 2023 21:27:31 +0000 (23:27 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Aug 2023 21:49:38 +0000 (14:49 -0700)
Fix up missed semantic mis-merge between commits

  161e393c0f63 ("mm: Make pte_mkwrite() take a VMA")
  27af67f35631 ("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 2f0584f3f4bd ("mm: Rename arch
pte_mkwrite()'s to pte_mkwrite_novma()").

Fixes: df57721f9a63 ("Merge tag 'x86_shstk_for_6.6-rc1' of [...]")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/powerpc/include/asm/book3s/64/pgtable.h

index 136232a..5c497c8 100644 (file)
@@ -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