From: Thomas Huth <thuth@redhat.com>
To: x86@kernel.org, Thomas Gleixner <tglx@kernel.org>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>, Coiby Xu <coxu@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] x86/headers: Remove "#include <asm/pgtable.h>" from set_memory.h
Date: Thu, 9 Apr 2026 16:48:19 +0200 [thread overview]
Message-ID: <20260409144819.2000120-1-thuth@redhat.com> (raw)
From: Thomas Huth <thuth@redhat.com>
The "#include <asm/pgtable.h>" has been added to set_memory.h in
commit e1e6cd01d933 ("Revert "x86/mm: Remove unused __set_memory_prot()"")
to provide the "pgprot_t" type in the prototype of __set_memory_prot().
Later, the prototype of __set_memory_prot() has been removed again, see
commit 8a4e92b3260a ("x86/crash: Use set_memory_p() instead of
__set_memory_prot()"), but the pgtable.h line has been left in the header.
Thus, since it's not required here anymore, remove it now from
set_memory.h. However, there is a indirect dependency on pgtable.h
in the sev.h header file instead, so we now have to include it there
to avoid that the build breaks.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
arch/x86/include/asm/set_memory.h | 1 -
arch/x86/include/asm/sev.h | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
index 4362c26aa992d..8d9f1c9aaa4ce 100644
--- a/arch/x86/include/asm/set_memory.h
+++ b/arch/x86/include/asm/set_memory.h
@@ -4,7 +4,6 @@
#include <asm/page.h>
#include <asm-generic/set_memory.h>
-#include <asm/pgtable.h>
#define set_memory_rox set_memory_rox
int set_memory_rox(unsigned long addr, int numpages);
diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h
index 0e6c0940100f3..3936c821d6b0a 100644
--- a/arch/x86/include/asm/sev.h
+++ b/arch/x86/include/asm/sev.h
@@ -14,6 +14,7 @@
#include <asm/insn.h>
#include <asm/sev-common.h>
#include <asm/coco.h>
+#include <asm/pgtable.h>
#include <asm/set_memory.h>
#include <asm/svm.h>
--
2.53.0
next reply other threads:[~2026-04-09 14:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-09 14:48 Thomas Huth [this message]
2026-04-15 0:52 ` [PATCH] x86/headers: Remove "#include <asm/pgtable.h>" from set_memory.h Coiby Xu
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=20260409144819.2000120-1-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=bp@alien8.de \
--cc=coxu@redhat.com \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@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