[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-45deca7d96e0e33061b7d12932b381114db18f60@git.kernel.org>
Date: Fri, 22 Jun 2018 05:41:43 -0700
From: tip-bot for Borislav Petkov <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: bp@...e.de, tglx@...utronix.de, mingo@...nel.org,
linux-kernel@...r.kernel.org, hpa@...or.com
Subject: [tip:ras/core] x86/mce: Remove !banks check
Commit-ID: 45deca7d96e0e33061b7d12932b381114db18f60
Gitweb: https://git.kernel.org/tip/45deca7d96e0e33061b7d12932b381114db18f60
Author: Borislav Petkov <bp@...e.de>
AuthorDate: Fri, 22 Jun 2018 11:54:25 +0200
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 22 Jun 2018 14:37:22 +0200
x86/mce: Remove !banks check
If we don't have MCA banks, we won't see machine checks anyway. Drop the
check.
Signed-off-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Link: https://lkml.kernel.org/r/20180622095428.626-5-bp@alien8.de
---
arch/x86/kernel/cpu/mcheck/mce.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 18804834dbc0..8ac2ea2a874a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1187,9 +1187,6 @@ void do_machine_check(struct pt_regs *regs, long error_code)
this_cpu_inc(mce_exception_count);
- if (!cfg->banks)
- goto out;
-
mce_gather_info(&m, regs);
m.tsc = rdtsc();
@@ -1329,7 +1326,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)
if (worst > 0)
mce_report_event(regs);
mce_wrmsrl(MSR_IA32_MCG_STATUS, 0);
-out:
+
sync_core();
if (worst != MCE_AR_SEVERITY && !kill_it)
Powered by blists - more mailing lists