From: "tip-bot2 for Ingo Molnar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/merge] powerpc: Fix pud_mkwrite() definition after pte_mkwrite() API changes
Date: Thu, 31 Aug 2023 21:36:43 -0000 [thread overview]
Message-ID: <169351780302.27769.17248480254540451210.tip-bot2@tip-bot2> (raw)
In-Reply-To: <ZPEFw1XGrI69ZbJ6@gmail.com>
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: cc852156ee7cbd4c83dfd64e9b800f7932f867d0
Gitweb: https://git.kernel.org/tip/cc852156ee7cbd4c83dfd64e9b800f7932f867d0
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Thu, 31 Aug 2023 23:27:31 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Thu, 31 Aug 2023 23:32:39 +02:00
powerpc: Fix pud_mkwrite() definition after pte_mkwrite() API changes
I believe there's one semantic conflict we missed, which breaks the powerpc64
build: recent changes to arch/powerpc/include/asm/book3s/64/pgtable.h created
a new semantic conflict due to the changes to the pte_mkwrite() API:
161e393c0f63 ("mm: Make pte_mkwrite() take a VMA")
... resolved with the fix below.
Only build tested though.
The crossing upstream commit was:
27af67f35631 ("powerpc/book3s64/mm: enable transparent pud hugepage")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/ZPEFw1XGrI69ZbJ6@gmail.com
--
arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
index 136232a..5c497c8 100644
--- a/arch/powerpc/include/asm/book3s/64/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -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
next prev parent reply other threads:[~2023-08-31 21:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-30 23:47 [GIT PULL] x86/shstk for 6.6-rc1 Dave Hansen
2023-08-31 19:40 ` Linus Torvalds
2023-08-31 21:27 ` [PATCH] powerpc: Fix pud_mkwrite() definition after pte_mkwrite() API changes [was: Re: [GIT PULL] x86/shstk for 6.6-rc1] Ingo Molnar
2023-08-31 21:36 ` tip-bot2 for Ingo Molnar [this message]
2023-08-31 21:50 ` Linus Torvalds
2023-08-31 19:42 ` [GIT PULL] x86/shstk for 6.6-rc1 pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=169351780302.27769.17248480254540451210.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®