* [PATCH] x86/nmi: Remove edac.h include leftover
@ 2020-05-15 18:22 Borislav Petkov
2020-05-16 5:55 ` [tip: x86/cleanups] " tip-bot2 for Borislav Petkov
0 siblings, 1 reply; 2+ messages in thread
From: Borislav Petkov @ 2020-05-15 18:22 UTC (permalink / raw)
To: X86 ML; +Cc: LKML
From: Borislav Petkov <bp@suse.de>
... 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 <bp@suse.de>
---
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 6407ea21fa1b..bdcc5146de96 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>
--
2.21.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/cleanups] x86/nmi: Remove edac.h include leftover
2020-05-15 18:22 [PATCH] x86/nmi: Remove edac.h include leftover Borislav Petkov
@ 2020-05-16 5:55 ` tip-bot2 for Borislav Petkov
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Borislav Petkov @ 2020-05-16 5:55 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Borislav Petkov, x86, LKML
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 <bp@suse.de>
AuthorDate: Fri, 15 May 2020 20:21:21 +02:00
Committer: Borislav Petkov <bp@suse.de>
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 <bp@suse.de>
Link: https://lkml.kernel.org/r/20200515182246.3553-1-bp@alien8.de
---
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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-16 5:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-15 18:22 [PATCH] x86/nmi: Remove edac.h include leftover Borislav Petkov
2020-05-16 5:55 ` [tip: x86/cleanups] " tip-bot2 for Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).