Skip to contentSkip to conversation

x86/nmi: Remove stale EDAC include leftover

PATCH Applied Borislav Petkov 3 participants 3 messages Sep 23, 2019 – Oct 1, 2019 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/nmi: Remove stale EDAC include leftover

From: Borislav Petkov <[email protected]>

db47d5f85646 ("x86/nmi, EDAC: Get rid of DRAM error reporting thru PCI SERR NMI")

forgot to remove it. Drop it.

---
 arch/x86/kernel/traps.c | 5 -----
 1 file changed, 5 deletions(-)
arch/x86/kernel/traps.c +0 -5
index 4bb0f8447112..c90312146da0 100644
@@ -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>
Signature · 1 line
2.21.0
#2 lore raw
In reply to Borislav Petkov
The following commit has been merged into the x86/cleanups branch of tip:

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 <[email protected]>
AuthorDate:    Thu, 16 Aug 2018 09:14:04 +02:00
Committer:     Borislav Petkov <[email protected]>
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.

---
 arch/x86/kernel/traps.c | 5 -----
 1 file changed, 5 deletions(-)
arch/x86/kernel/traps.c +0 -5
index 4bb0f84..c903121 100644
@@ -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>