Received-SPF: pass (google.com: domain of linux-kernel+bounces-3571-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 18 Dec 2023 20:33:39 +0800
From: Wang Jinchao <wangjinchao@xfusion.com>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
	Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>,
	<x86@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
	<linux-kernel@vger.kernel.org>
CC: <stone.xulei@xfusion.com>, <wangjinchao@xfusion.com>
Subject: [PATCH v2] x86/setup: Remove duplicate header includes
Message-ID: <202312182031+0800-wangjinchao@xfusion.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline

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

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