From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org,
mingo@kernel.org, bp@suse.de, hpa@zytor.com, tglx@linutronix.de,
tony.luck@intel.com
Subject: [tip:ras/core] x86/mce: Restore MCE injector's module name
Date: Tue, 18 Dec 2018 15:09:51 -0800 [thread overview]
Message-ID: <tip-72a8f089c382c078f8c7c1c759cb726de80d4284@git.kernel.org> (raw)
In-Reply-To: <20181218182546.GA21386@zn.tnic>
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(-)
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
next prev parent reply other threads:[~2018-12-18 23:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-05 14:13 [PATCH] x86/mce: Streamline MCE subsystem's naming Borislav Petkov
2018-12-05 16:30 ` Ingo Molnar
2018-12-05 17:00 ` Borislav Petkov
2018-12-05 18:01 ` Ingo Molnar
2018-12-05 19:03 ` Borislav Petkov
2018-12-06 16:27 ` Ingo Molnar
2018-12-06 17:36 ` Luck, Tony
2018-12-06 18:05 ` Borislav Petkov
2018-12-05 16:57 ` Luck, Tony
2018-12-05 20:09 ` [PATCH] x86/mce: Unify pr_* prefix Borislav Petkov
2018-12-11 13:31 ` [tip:ras/core] " tip-bot for Borislav Petkov
2018-12-18 18:25 ` [PATCH] x86/mce: Restore MCE injector's module name Borislav Petkov
2018-12-18 23:09 ` tip-bot for Borislav Petkov [this message]
2018-12-11 13:30 ` [tip:ras/core] x86/mce: Streamline MCE subsystem's naming tip-bot for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-72a8f089c382c078f8c7c1c759cb726de80d4284@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®