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.
Signed-off-by: Borislav Petkov <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
arch/x86/kernel/nmi.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 6407ea2..bdcc514 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -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>
