diff options
| author | Jan H. Schönherr <jschoenh@amazon.de> | 2019-12-10 01:07:32 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2019-12-17 10:26:35 +0100 |
| commit | 2d806d0723589a726b48b88e0f53988849dc03d3 (patch) | |
| tree | 2cb5f1359c841159af77b2e3db7d048c5b0a1a4c /arch/x86/kernel/cpu/mce | |
| parent | db1ae0314f47e88ae06679270adf17ffa245afd4 (diff) | |
| download | linux-2d806d0723589a726b48b88e0f53988849dc03d3.tar.bz2 | |
x86/mce: Pass MCE message to mce_panic() on failed kernel recovery
In commit
b2f9d678e28c ("x86/mce: Check for faults tagged in EXTABLE_CLASS_FAULT exception table entries")
another call to mce_panic() was introduced. Pass the message of the
handled MCE to that instance of mce_panic() as well, as there doesn't
seem to be a reason not to.
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-6-jschoenh@amazon.de
Diffstat (limited to 'arch/x86/kernel/cpu/mce')
| -rw-r--r-- | arch/x86/kernel/cpu/mce/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 5f42f25bac8f..edfbb9ce6bef 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -1365,7 +1365,7 @@ void do_machine_check(struct pt_regs *regs, long error_code) ist_end_non_atomic(); } else { if (!fixup_exception(regs, X86_TRAP_MC, error_code, 0)) - mce_panic("Failed kernel mode recovery", &m, NULL); + mce_panic("Failed kernel mode recovery", &m, msg); } out_ist: |