Re: [PATCH] x86/headers: Remove "#include <asm/pgtable.h>" from set_memory.h

[Thomas Huth <thuth@redhat.com>]

On 15/04/2026 02.52, Coiby Xu wrote:
> On Thu, Apr 09, 2026 at 04:48:19PM +0200, Thomas Huth wrote:
>> 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
>>
> 
> I forgot to drop unneeded pgtable.h. Thanks for addressing it!
> 
> Acked-by: Coiby Xu <coiby.xu@gmail.com>
Friendly ping! Could anybody pick this up?

  Thanks,
   Thomas