tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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>

authored by

Ingo Molnar and committed by
Linus Torvalds f441ff73 87dfd85c

+1 -1
+1 -1
arch/powerpc/include/asm/book3s/64/pgtable.h
··· 931 931 #define pud_mkdirty(pud) pte_pud(pte_mkdirty(pud_pte(pud))) 932 932 #define pud_mkclean(pud) pte_pud(pte_mkclean(pud_pte(pud))) 933 933 #define pud_mkyoung(pud) pte_pud(pte_mkyoung(pud_pte(pud))) 934 - #define pud_mkwrite(pud) pte_pud(pte_mkwrite(pud_pte(pud))) 934 + #define pud_mkwrite(pud) pte_pud(pte_mkwrite_novma(pud_pte(pud))) 935 935 #define pud_write(pud) pte_write(pud_pte(pud)) 936 936 937 937 #ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY