2024-03-22 06:41:59

by Jiapeng Chong

[permalink] [raw]
Subject: [PATCH] xen/x86: Remove duplicate include

/arch/x86/xen/enlighten.c: linux/memblock.h is included more than once.

Reported-by: Abaci Robot <[email protected]>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=8610
Signed-off-by: Jiapeng Chong <[email protected]>
---
arch/x86/xen/enlighten.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index a01ca255b0c6..5f3a69f6ec34 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1,8 +1,5 @@
// SPDX-License-Identifier: GPL-2.0

-#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
-#include <linux/memblock.h>
-#endif
#include <linux/console.h>
#include <linux/cpu.h>
#include <linux/kexec.h>
--
2.20.1.7.g153144c



2024-03-22 06:53:36

by Jürgen Groß

[permalink] [raw]
Subject: Re: [PATCH] xen/x86: Remove duplicate include

On 22.03.24 07:39, Jiapeng Chong wrote:
> ./arch/x86/xen/enlighten.c: linux/memblock.h is included more than once.
>
> Reported-by: Abaci Robot <[email protected]>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=8610
> Signed-off-by: Jiapeng Chong <[email protected]>

Reviewed-by: Juergen Gross <[email protected]>


Juergen


Subject: [tip: x86/cleanups] x86/xen: Remove duplicate #include

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: b0daa43204b1b78dce43e26604e47e3e55e1af91
Gitweb: https://git.kernel.org/tip/b0daa43204b1b78dce43e26604e47e3e55e1af91
Author: Jiapeng Chong <[email protected]>
AuthorDate: Fri, 22 Mar 2024 14:39:57 +08:00
Committer: Ingo Molnar <[email protected]>
CommitterDate: Fri, 22 Mar 2024 09:34:15 +01:00

x86/xen: Remove duplicate #include

/arch/x86/xen/enlighten.c: linux/memblock.h is included more than once.

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Jiapeng Chong <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Reviewed-by: Juergen Gross <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=8610
---
arch/x86/xen/enlighten.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 3c61bb9..7030a6a 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1,8 +1,5 @@
// SPDX-License-Identifier: GPL-2.0

-#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
-#include <linux/memblock.h>
-#endif
#include <linux/console.h>
#include <linux/cpu.h>
#include <linux/kexec.h>