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@xxxxxxxxxxxxxxxxx> AuthorDate: Fri, 22 Mar 2024 14:39:57 +08:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxxx> Signed-off-by: Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Reviewed-by: Juergen Gross <jgross@xxxxxxxx> Link: https://lore.kernel.org/r/20240322063957.94159-1-jiapeng.chong@xxxxxxxxxxxxxxxxx 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>
|