[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <171109677769.10875.7841656344559570766.tip-bot2@tip-bot2>
Date: Fri, 22 Mar 2024 08:39:37 -0000
From: "tip-bot2 for Jiapeng Chong" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Abaci Robot <abaci@...ux.alibaba.com>,
Jiapeng Chong <jiapeng.chong@...ux.alibaba.com>,
Ingo Molnar <mingo@...nel.org>, Juergen Gross <jgross@...e.com>,
x86@...nel.org, linux-kernel@...r.kernel.org
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 <jiapeng.chong@...ux.alibaba.com>
AuthorDate: Fri, 22 Mar 2024 14:39:57 +08:00
Committer: Ingo Molnar <mingo@...nel.org>
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 <abaci@...ux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@...ux.alibaba.com>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Reviewed-by: Juergen Gross <jgross@...e.com>
Link: https://lore.kernel.org/r/20240322063957.94159-1-jiapeng.chong@linux.alibaba.com
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>
Powered by blists - more mailing lists