Skip to content

Commit f441ff7

Browse files
Ingo Molnartorvalds
authored andcommitted
powerpc: Fix pud_mkwrite() definition after pte_mkwrite() API changes
Fix up missed semantic mis-merge between commits 161e393 ("mm: Make pte_mkwrite() take a VMA") 27af67f ("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 2f0584f ("mm: Rename arch pte_mkwrite()'s to pte_mkwrite_novma()"). Fixes: df57721 ("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>
1 parent 87dfd85 commit f441ff7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ static inline pte_t *pudp_ptep(pud_t *pud)
931931
#define pud_mkdirty(pud) pte_pud(pte_mkdirty(pud_pte(pud)))
932932
#define pud_mkclean(pud) pte_pud(pte_mkclean(pud_pte(pud)))
933933
#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)))
935935
#define pud_write(pud) pte_write(pud_pte(pud))
936936

937937
#ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY

0 commit comments

Comments
 (0)