x86/mce: add a switch of CONFIG_X86_MCELOG_LEGACY

Commit Message

Xiaochun Lee Sept. 11, 2019, 3:28 p.m. UTC

From: Xiaochun Lee <[e-mail]>

Add CONFIG_X86_MCELOG_LEGACY to control the
behavior of several functions be compiled.

Signed-off-by: Xiaochun Lee <[e-mail]>
---
 arch/x86/kernel/cpu/mce/dev-mcelog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Borislav Petkov Sept. 11, 2019, 3:40 p.m. UTC | #1

On Wed, Sep 11, 2019 at 11:28:50PM +0800, Xiaochun Lee wrote:
> From: Xiaochun Lee <[e-mail]>
> 
> Add CONFIG_X86_MCELOG_LEGACY to control the
> behavior of several functions be compiled.

... because?

Your commit messages structure should look something like this:

Problem is A.

It happens because of B.

Fix it by doing C.

(Potentially do D).

For more detailed info, see
Documentation/process/submitting-patches.rst, Section "2) Describe your
changes".

Patch

diff --git a/arch/x86/kernel/cpu/mce/dev-mcelog.c b/arch/x86/kernel/cpu/mce/dev-mcelog.c
index 7c8958d..6add0ce 100644
--- a/arch/x86/kernel/cpu/mce/dev-mcelog.c
+++ b/arch/x86/kernel/cpu/mce/dev-mcelog.c
@@ -82,7 +82,7 @@  static void mce_do_trigger(struct work_struct *work)
 
 static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
 
-
+#ifdef CONFIG_X86_MCELOG_LEGACY
 void mce_work_trigger(void)
 {
 	if (mce_helper[0])
@@ -113,6 +113,7 @@  static ssize_t set_trigger(struct device *s, struct device_attribute *attr,
 }
 
 DEVICE_ATTR(trigger, 0644, show_trigger, set_trigger);
+#endif
 
 /*
  * mce_chrdev: Character device /dev/mcelog to read and clear the MCE log.
@@ -276,6 +277,7 @@  static long mce_chrdev_ioctl(struct file *f, unsigned int cmd,
 	}
 }
 
+#ifdef CONFIG_X86_MCELOG_LEGACY
 void mce_register_injector_chain(struct notifier_block *nb)
 {
 	blocking_notifier_chain_register(&mce_injector_chain, nb);
@@ -287,6 +289,7 @@  void mce_unregister_injector_chain(struct notifier_block *nb)
 	blocking_notifier_chain_unregister(&mce_injector_chain, nb);
 }
 EXPORT_SYMBOL_GPL(mce_unregister_injector_chain);
+#endif
 
 static ssize_t mce_chrdev_write(struct file *filp, const char __user *ubuf,
 				size_t usize, loff_t *off)