2023-12-12 00:38:45

by Yang Li

Subject: [PATCH -next] x86/virt/tdx: Remove duplicated include in tdx.c

The header files linux/acpi.h and asm/cpufeature.h are both
included twice in C, so one inclusion of each can be removed.

Reported-by: Abaci Robot <[email protected]>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7713
Signed-off-by: Yang Li <[email protected]>
---
arch/x86/virt/vmx/tdx/tdx.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c
index 13df68ef40b5..49a1c6890b55 100644
--- a/arch/x86/virt/vmx/tdx/tdx.c
+++ b/arch/x86/virt/vmx/tdx/tdx.c
@@ -27,14 +27,12 @@
#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>
#include <asm/msr.h>
#include <asm/cpufeature.h>
#include <asm/tdx.h>
-#include <asm/cpufeature.h>
#include <asm/intel-family.h>
#include <asm/processor.h>
#include <asm/mce.h>
--
2.20.1.7.g153144c

2023-12-12 01:06:06

by Huang, Kai

Subject: Re: [PATCH -next] x86/virt/tdx: Remove duplicated include in tdx.c

On Tue, 2023-12-12 at 08:38 +0800, Yang Li wrote:
> The header files linux/acpi.h and asm/cpufeature.h are both
> included twice in C, so one inclusion of each can be removed.
>
> Reported-by: Abaci Robot <[email protected]>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7713
> Signed-off-by: Yang Li <[email protected]>

Reviewed-by: Kai Huang <[email protected]>

> ---
> arch/x86/virt/vmx/tdx/tdx.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c
> index 13df68ef40b5..49a1c6890b55 100644
> --- a/arch/x86/virt/vmx/tdx/tdx.c
> +++ b/arch/x86/virt/vmx/tdx/tdx.c
> @@ -27,14 +27,12 @@
> #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>
> #include <asm/msr.h>
> #include <asm/cpufeature.h>
> #include <asm/tdx.h>
> -#include <asm/cpufeature.h>
> #include <asm/intel-family.h>
> #include <asm/processor.h>
> #include <asm/mce.h>

2023-12-12 10:33:49

by Kirill A. Shutemov

Subject: Re: [PATCH -next] x86/virt/tdx: Remove duplicated include in tdx.c

On Tue, Dec 12, 2023 at 08:38:25AM +0800, Yang Li wrote:
> The header files linux/acpi.h and asm/cpufeature.h are both
> included twice in C, so one inclusion of each can be removed.
>
> Reported-by: Abaci Robot <[email protected]>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=7713
> Signed-off-by: Yang Li <[email protected]>

Acked-by: Kirill A. Shutemov <[email protected]>

--
Kiryl Shutsemau / Kirill A. Shutemov

2023-12-12 19:00:44

by Dave Hansen

Subject: Re: [PATCH -next] x86/virt/tdx: Remove duplicated include in tdx.c

On 12/11/23 16:38, Yang Li wrote:
> The header files linux/acpi.h and asm/cpufeature.h are both
> included twice in C, so one inclusion of each can be removed.

Thanks for the report. I've just squashed this back into the culprit patch.