* [PATCH] x86/nmi: Remove stale EDAC include leftover
@ 2019-09-23 19:38 Borislav Petkov
2019-09-23 20:20 ` Thomas Gleixner
2019-10-01 9:23 ` [tip: x86/cleanups] " tip-bot2 for Borislav Petkov
0 siblings, 2 replies; 3+ messages in thread
From: Borislav Petkov @ 2019-09-23 19:38 UTC (permalink / raw)
To: X86 ML; +Cc: LKML
From: Borislav Petkov <bp@suse.de>
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>
---
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 4bb0f8447112..c90312146da0 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>
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] x86/nmi: Remove stale EDAC include leftover
2019-09-23 19:38 [PATCH] x86/nmi: Remove stale EDAC include leftover Borislav Petkov
@ 2019-09-23 20:20 ` Thomas Gleixner
2019-10-01 9:23 ` [tip: x86/cleanups] " tip-bot2 for Borislav Petkov
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Gleixner @ 2019-09-23 20:20 UTC (permalink / raw)
To: Borislav Petkov; +Cc: X86 ML, LKML
On Mon, 23 Sep 2019, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
>
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip: x86/cleanups] x86/nmi: Remove stale EDAC include leftover
2019-09-23 19:38 [PATCH] x86/nmi: Remove stale EDAC include leftover Borislav Petkov
2019-09-23 20:20 ` Thomas Gleixner
@ 2019-10-01 9:23 ` tip-bot2 for Borislav Petkov
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Borislav Petkov @ 2019-10-01 9:23 UTC (permalink / raw)
To: linux-tip-commits
Cc: Borislav Petkov, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
linux-kernel
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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-01 9:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-23 19:38 [PATCH] x86/nmi: Remove stale EDAC include leftover Borislav Petkov
2019-09-23 20:20 ` Thomas Gleixner
2019-10-01 9:23 ` [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