Messages in this thread Patch in this message | | | Date | Tue, 01 Oct 2019 09:23:46 -0000 | From | "tip-bot2 for Borislav Petkov" <> | Subject | [tip: x86/cleanups] x86/nmi: Remove stale EDAC include leftover |
| |
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: abaebe11dd07adf51b53bb7c56ba35eab267654d Gitweb: https://git.kernel.org/tip/abaebe11dd07adf51b53bb7c56ba35eab267654d Author: Borislav Petkov <bp@suse.de> AuthorDate: Thu, 16 Aug 2018 09:14:04 +02:00 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Tue, 01 Oct 2019 11:11:11 +02:00
x86/nmi: Remove stale EDAC include leftover
db47d5f85646 ("x86/nmi, EDAC: Get rid of DRAM error reporting thru PCI SERR NMI")
forgot to remove it. Drop it.
Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20190923193807.30896-1-bp@alien8.de --- arch/x86/kernel/traps.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 4bb0f84..c903121 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -37,11 +37,6 @@ #include <linux/mm.h> #include <linux/smp.h> #include <linux/io.h> - -#if defined(CONFIG_EDAC) -#include <linux/edac.h> -#endif - #include <asm/stacktrace.h> #include <asm/processor.h> #include <asm/debugreg.h>
| |