Patchwork [tip:ras/core] x86/mce: Restore MCE injector's module name

login
register
mail settings
Submitter tip-bot for Borislav Petkov
Date Dec. 18, 2018, 11:09 p.m.
Message ID <tip-72a8f089c382c078f8c7c1c759cb726de80d4284@git.kernel.org>
Download mbox | patch
Permalink /patch/685661/
State New
Headers show

Comments

tip-bot for Borislav Petkov - Dec. 18, 2018, 11:09 p.m.
Commit-ID:  72a8f089c382c078f8c7c1c759cb726de80d4284
Gitweb:     https://git.kernel.org/tip/72a8f089c382c078f8c7c1c759cb726de80d4284
Author:     Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 18 Dec 2018 19:25:46 +0100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 19 Dec 2018 00:04:36 +0100

x86/mce: Restore MCE injector's module name

It was mce-inject.ko but it turned into inject.ko since the containing
source file got renamed. Restore it.

Fixes: 21afaf181362 ("x86/mce: Streamline MCE subsystem's naming")
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20181218182546.GA21386@zn.tnic
---
 arch/x86/kernel/cpu/mce/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/arch/x86/kernel/cpu/mce/Makefile b/arch/x86/kernel/cpu/mce/Makefile
index 765759765ab7..9f020c994154 100644
--- a/arch/x86/kernel/cpu/mce/Makefile
+++ b/arch/x86/kernel/cpu/mce/Makefile
@@ -5,7 +5,9 @@  obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o
 obj-$(CONFIG_X86_MCE_INTEL)	+= intel.o
 obj-$(CONFIG_X86_MCE_AMD)	+= amd.o
 obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o
-obj-$(CONFIG_X86_MCE_INJECT)	+= inject.o
+
+mce-inject-y			:= inject.o
+obj-$(CONFIG_X86_MCE_INJECT)	+= mce-inject.o
 
 obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o