The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: e33ab2064836600603289ad2ed0ca3424f395fa8 Gitweb: https://git.kernel.org/tip/e33ab2064836600603289ad2ed0ca3424f395fa8 Author: Wang Hai <wanghai38@xxxxxxxxxx> AuthorDate: Wed, 19 Aug 2020 19:29:10 +08:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Thu, 27 Aug 2020 12:00:28 +02:00 x86/mpparse: Remove duplicate io_apic.h include Remove asm/io_apic.h which is included more than once. Reported-by: Hulk Robot <hulkci@xxxxxxxxxx> Signed-off-by: Wang Hai <wanghai38@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20200819112910.7629-1-wanghai38@xxxxxxxxxx --- arch/x86/kernel/mpparse.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 411af4a..00e5162 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -24,7 +24,6 @@ #include <asm/irqdomain.h> #include <asm/mtrr.h> #include <asm/mpspec.h> -#include <asm/io_apic.h> #include <asm/proto.h> #include <asm/bios_ebda.h> #include <asm/e820/api.h>