rm the second #include <asm/efi.h> in setup.c
rm the second #include <asm/spec-ctrl.h> in smpboot.c

Signed-off-by: Wang Jinchao <wangjinchao@xfusion.com>
---
 arch/x86/kernel/setup.c   | 1 -
 arch/x86/kernel/smpboot.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 1526747bedf2..f6152c6b139a 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -37,7 +37,6 @@
 #include <asm/bugs.h>
 #include <asm/cacheinfo.h>
 #include <asm/cpu.h>
-#include <asm/efi.h>
 #include <asm/gart.h>
 #include <asm/hypervisor.h>
 #include <asm/io_apic.h>
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 2cc2aa120b4b..45057860e034 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -87,7 +87,6 @@
 #include <asm/hw_irq.h>
 #include <asm/stackprotector.h>
 #include <asm/sev.h>
-#include <asm/spec-ctrl.h>
 
 /* representing HT siblings of each logical CPU */
 DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);
-- 
2.40.0

How about rewording the above to?

"x86/setup: Remove duplicate header includes"

On 12/15/2023 3:25 PM, Wang Jinchao wrote:
> rm the second #include <asm/efi.h> in setup.c

> rm the second #include <asm/spec-ctrl.h> in smpboot.c

Actually, these two lines are evident from the diff itself. You can
remove both of them. If you really want to have some text in the commit
message you can probably just say:

efi.h and spec-ctrl.h are included twice. Remove the duplicate entries.

> 
> Signed-off-by: Wang Jinchao <wangjinchao@xfusion.com>
> ---
>  arch/x86/kernel/setup.c   | 1 -
>  arch/x86/kernel/smpboot.c | 1 -
>  2 files changed, 2 deletions(-)
> 

With the above changes, please feel free to add:

Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>

> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index 1526747bedf2..f6152c6b139a 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -37,7 +37,6 @@
>  #include <asm/bugs.h>
>  #include <asm/cacheinfo.h>
>  #include <asm/cpu.h>
> -#include <asm/efi.h>
>  #include <asm/gart.h>
>  #include <asm/hypervisor.h>
>  #include <asm/io_apic.h>
> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> index 2cc2aa120b4b..45057860e034 100644
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@ -87,7 +87,6 @@
>  #include <asm/hw_irq.h>
>  #include <asm/stackprotector.h>
>  #include <asm/sev.h>
> -#include <asm/spec-ctrl.h>
>  
>  /* representing HT siblings of each logical CPU */
>  DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);

On Mon, Dec 18, 2023 at 05:27:46PM +0530, Sohil Mehta wrote:
> How about rewording the above to?
> 
> "x86/setup: Remove duplicate header includes"
> 
> On 12/15/2023 3:25 PM, Wang Jinchao wrote:
> > rm the second #include <asm/efi.h> in setup.c
> 
> > rm the second #include <asm/spec-ctrl.h> in smpboot.c
> 
> Actually, these two lines are evident from the diff itself. You can
> remove both of them. If you really want to have some text in the commit
> message you can probably just say:
> 
> efi.h and spec-ctrl.h are included twice. Remove the duplicate entries.
> 
> > 
> > Signed-off-by: Wang Jinchao <wangjinchao@xfusion.com>
> > ---
> >  arch/x86/kernel/setup.c   | 1 -
> >  arch/x86/kernel/smpboot.c | 1 -
> >  2 files changed, 2 deletions(-)
> > 
> 
> With the above changes, please feel free to add:
> 
> Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>
> 
Thanks for the suggestion, which has been applied to the v2 patch.