The following commit has been merged into the ras/core branch of tip:
Commit-ID: 2322b532ad9043336f36ba2634ab3620d5d5b4f5
Gitweb: https://git.kernel.org/tip/2322b532ad9043336f36ba2634ab3620d5d5b4f5
Author: Zhaolong Zhang <zhangzl2013@xxxxxxx>
AuthorDate: Tue, 09 Nov 2021 19:23:45 +08:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Wed, 17 Nov 2021 15:32:31 +01:00
x86/mce: Get rid of cpu_missing
Get rid of cpu_missing because
7bb39313cd62 ("x86/mce: Make mce_timed_out() identify holdout CPUs")
provides a more detailed message about which CPUs are missing.
Suggested-by: Borislav Petkov <bp@xxxxxxx>
Signed-off-by: Zhaolong Zhang <zhangzl2013@xxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20211109112345.2673403-1-zhangzl2013@xxxxxxx
---
arch/x86/kernel/cpu/mce/core.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 6ed3653..30de00f 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -99,7 +99,6 @@ struct mca_config mca_cfg __read_mostly = {
static DEFINE_PER_CPU(struct mce, mces_seen);
static unsigned long mce_need_notify;
-static int cpu_missing;
/*
* MCA banks polled by the period polling timer for corrected events.
@@ -314,8 +313,6 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
if (!apei_err)
apei_err = apei_write_mce(final);
}
- if (cpu_missing)
- pr_emerg(HW_ERR "Some CPUs didn't answer in synchronization\n");
if (exp)
pr_emerg(HW_ERR "Machine check: %s\n", exp);
if (!fake_panic) {
@@ -891,7 +888,6 @@ static int mce_timed_out(u64 *t, const char *msg)
cpumask_pr_args(&mce_missing_cpus));
mce_panic(msg, NULL, NULL);
}
- cpu_missing = 1;
return 1;
}
*t -= SPINUNIT;
@@ -2702,7 +2698,6 @@ struct dentry *mce_get_debugfs_dir(void)
static void mce_reset(void)
{
- cpu_missing = 0;
atomic_set(&mce_fake_panicked, 0);
atomic_set(&mce_executing, 0);
atomic_set(&mce_callin, 0);
|