Skip to contentSkip to conversation

x86/nmi: Remove edac.h include leftover

PATCH Applied Borislav Petkov 2 participants 2 messages May 15, 2020 – May 16, 2020 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/nmi: Remove edac.h include leftover

From: Borislav Petkov <[email protected]>

... which

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

forgot to remove.

No functional changes.

---
 arch/x86/kernel/nmi.c | 4 ----
 1 file changed, 4 deletions(-)
arch/x86/kernel/nmi.c +0 -4
index 6407ea21fa1b..bdcc5146de96 100644
@@ -25,10 +25,6 @@
 #include <linux/atomic.h>
 #include <linux/sched/clock.h>
 
-#if defined(CONFIG_EDAC)
-#include <linux/edac.h>
-#endif
-
 #include <asm/cpu_entry_area.h>
 #include <asm/traps.h>
 #include <asm/mach_traps.h>
Signature · 1 line
2.21.0
#1 lore raw
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:     6255c161a08564e4f3995db31f3d64a5fd24738b
Gitweb:        https://git.kernel.org/tip/6255c161a08564e4f3995db31f3d64a5fd24738b
Author:        Borislav Petkov <[email protected]>
AuthorDate:    Fri, 15 May 2020 20:21:21 +02:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Sat, 16 May 2020 07:47:57 +02:00

x86/nmi: Remove edac.h include leftover

... which

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

forgot to remove.

No functional changes.

---
 arch/x86/kernel/nmi.c | 4 ----
 1 file changed, 4 deletions(-)
arch/x86/kernel/nmi.c +0 -4
index 6407ea2..bdcc514 100644
@@ -25,10 +25,6 @@
 #include <linux/atomic.h>
 #include <linux/sched/clock.h>
 
-#if defined(CONFIG_EDAC)
-#include <linux/edac.h>
-#endif
-
 #include <asm/cpu_entry_area.h>
 #include <asm/traps.h>
 #include <asm/mach_traps.h>