[PATCH v2] x86/setup: Remove duplicate header includes

From: Wang Jinchao
Date: Mon Dec 18 2023 - 07:34:12 EST


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

Reviewed-by: Sohil Mehta <sohil.mehta@xxxxxxxxx>
Signed-off-by: Wang Jinchao <wangjinchao@xxxxxxxxxxx>
---
V2:
Adopt Sohil's suggestion to modify the comments.
V1: https://lore.kernel.org/lkml/202312151755+0800-wangjinchao@xxxxxxxxxxx/
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