The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 27d45fc7df2d9026185e86a7e45f3dd17f3e8ba4 Gitweb: https://git.kernel.org/tip/27d45fc7df2d9026185e86a7e45f3dd17f3e8ba4 Author: Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx> AuthorDate: Fri, 22 Mar 2024 14:17:41 +08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Fri, 22 Mar 2024 09:35:43 +01:00 x86/virt/tdx: Remove duplicate include /arch/x86/virt/vmx/tdx/tdx.c: linux/acpi.h is included more than once. Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx> Signed-off-by: Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Reviewed-by: Kai Huang <kai.huang@xxxxxxxxx> Link: https://lore.kernel.org/r/20240322061741.9869-1-jiapeng.chong@xxxxxxxxxxxxxxxxx Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=8609 --- arch/x86/virt/vmx/tdx/tdx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c index 4d6826a..49a1c68 100644 --- a/arch/x86/virt/vmx/tdx/tdx.c +++ b/arch/x86/virt/vmx/tdx/tdx.c @@ -27,7 +27,6 @@ #include <linux/log2.h> #include <linux/acpi.h> #include <linux/suspend.h> -#include <linux/acpi.h> #include <asm/page.h> #include <asm/special_insns.h> #include <asm/msr-index.h>
|