x86/headers: Remove "#include <asm/pgtable.h>" from set_memory.h
PATCH 1/1 x86/headers: Remove "#include <asm/pgtable.h>" from set_memory.h
From: Thomas Huth <[email protected]>
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.
--- arch/x86/include/asm/set_memory.h | 1 - arch/x86/include/asm/sev.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/set_memory.h +0 -1
@@ -4,7 +4,6 @@#include <asm/page.h> #include <asm-generic/set_memory.h> -#include <asm/pgtable.h> #define set_memory_rox set_memory_roxint set_memory_rox (unsigned long addr,int numpages);
arch/x86/include/asm/sev.h +1 -0
@@ -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>
Signature · 1 line
2.53.0
Quoted 46 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The "#include <
asm/pgtable.h>" has been added toset_memory.hin commite1e6cd01d933("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 commit8a4e92b3260a("x86/crash: Useset_memory_p()instead of__set_memory_prot()"), but thepgtable.hline has been left in the header. Thus, since it's not required here anymore, remove it now fromset_memory.h. However, there is a indirect dependency onpgtable.hin thesev.hheader file instead, so we now have to include it there to avoid that the build breaks.Signed-off-by Thomas Huth <[email protected]>---
arch/x86/include/asm/set_memory.h| 1 -arch/x86/include/asm/sev.h| 1 +2 files changed, 1 insertion(+), 1 deletion(-)arch/x86/include/asm/set_memory.h +0
-1@@ -4,7 +4,6 @@#include <asm/page.h> #include <asm-generic/set_memory.h> -#include <asm/pgtable.h> #define set_memory_rox set_memory_roxint set_memory_rox (unsigned long addr,int numpages);arch/x86/include/asm/sev.h +1
-0@@ -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> Signature · 1 line
2.53.0
I forgot to drop unneeded pgtable.h. Thanks for addressing it!
Signature · 2 lines
Best regards, Coiby
Quoted 44 lines · Coiby Xu
Quoted 43 lines · Thomas Huth
From: Thomas Huth <[email protected]>
The "#include <
asm/pgtable.h>" has been added toset_memory.hin commite1e6cd01d933("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 commit8a4e92b3260a("x86/crash: Useset_memory_p()instead of__set_memory_prot()"), but thepgtable.hline has been left in the header. Thus, since it's not required here anymore, remove it now fromset_memory.h. However, there is a indirect dependency onpgtable.hin thesev.hheader file instead, so we now have to include it there to avoid that the build breaks.Signed-off-by Thomas Huth <[email protected]>---
arch/x86/include/asm/set_memory.h| 1 -
arch/x86/include/asm/sev.h | 1 +2 files changed, 1 insertion(+), 1 deletion(-)arch/x86/include/asm/set_memory.h +0
-1@@ -4,7 +4,6 @@#include <asm/page.h> #include <asm-generic/set_memory.h> -#include <asm/pgtable.h> #define set_memory_rox set_memory_roxint set_memory_rox (unsigned long addr,int numpages);arch/x86/include/asm/sev.h +1
-0@@ -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>
Quoted 7 lines
Quoted 3 lines
Signature · 1 line
2.53.0I forgot to drop unneeded
pgtable.h. Thanks for addressing it!Acked-by Coiby Xu <[email protected]>
Friendly ping! Could anybody pick this up?
Thanks,
Thomas