openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/mce: Remove mce_inject_log() in favor of mce_log() 

The mutex in mce_inject_log() became unnecessary with commit

  5de97c9f6d ("x86/mce: Factor out and deprecate the /dev/mcelog driver"),

though the original reason for its presence only vanished with commit

  7298f08ea8 ("x86/mcelog: Get rid of RCU remnants").

Drop the mutex. And as that makes mce_inject_log() identical to mce_log(),
get rid of the former in favor of the latter.

Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20191210000733.17979-7-jschoenh@amazon.de
This commit is contained in:
Jan H. Schönherr 2019-12-10 01:07:33 +01:00 committed by Borislav Petkov
parent 2d806d0723
commit 81736abd55
3 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/kernel/cpu/mce/core.c
View File

@ -53,8 +53,6 @@
#include "internal.h" #include "internal.h"
static DEFINE_MUTEX(mce_log_mutex);
/* sysfs synchronization */ /* sysfs synchronization */
static DEFINE_MUTEX(mce_sysfs_mutex); static DEFINE_MUTEX(mce_sysfs_mutex);
@ -156,14 +154,7 @@ void mce_log(struct mce *m)
if (!mce_gen_pool_add(m)) if (!mce_gen_pool_add(m))
irq_work_queue(&mce_irq_work); irq_work_queue(&mce_irq_work);
} }
EXPORT_SYMBOL_GPL(mce_log);
void mce_inject_log(struct mce *m)
{
mutex_lock(&mce_log_mutex);
mce_log(m);
mutex_unlock(&mce_log_mutex);
}
EXPORT_SYMBOL_GPL(mce_inject_log);
static struct notifier_block mce_srao_nb; static struct notifier_block mce_srao_nb;

2
arch/x86/kernel/cpu/mce/inject.c
View File

@ -494,7 +494,7 @@ static void do_inject(void)
i_mce.status |= MCI_STATUS_SYNDV; i_mce.status |= MCI_STATUS_SYNDV;
if (inj_type == SW_INJ) { if (inj_type == SW_INJ) {
mce_inject_log(&i_mce); mce_log(&i_mce);
return; return;
} }

2
arch/x86/kernel/cpu/mce/internal.h
View File

@ -84,8 +84,6 @@ static inline int apei_clear_mce(u64 record_id)
} }
#endif #endif
void mce_inject_log(struct mce *m);
/* /*
* We consider records to be equivalent if bank+status+addr+misc all match. * We consider records to be equivalent if bank+status+addr+misc all match.
* This is only used when the system is going down because of a fatal error * This is only used when the system is going down because of a fatal error