diff options
Diffstat (limited to 'arch/x86/kernel/cpu')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index e535533d5ab8..20190bdac9d5 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
| @@ -708,6 +708,7 @@ static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp, | |||
| 708 | struct pt_regs *regs) | 708 | struct pt_regs *regs) |
| 709 | { | 709 | { |
| 710 | int i, ret = 0; | 710 | int i, ret = 0; |
| 711 | char *tmp; | ||
| 711 | 712 | ||
| 712 | for (i = 0; i < mca_cfg.banks; i++) { | 713 | for (i = 0; i < mca_cfg.banks; i++) { |
| 713 | m->status = mce_rdmsrl(MSR_IA32_MCx_STATUS(i)); | 714 | m->status = mce_rdmsrl(MSR_IA32_MCx_STATUS(i)); |
| @@ -716,9 +717,11 @@ static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp, | |||
| 716 | if (quirk_no_way_out) | 717 | if (quirk_no_way_out) |
| 717 | quirk_no_way_out(i, m, regs); | 718 | quirk_no_way_out(i, m, regs); |
| 718 | } | 719 | } |
| 719 | if (mce_severity(m, mca_cfg.tolerant, msg, true) >= | 720 | |
| 720 | MCE_PANIC_SEVERITY) | 721 | if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) { |
| 722 | *msg = tmp; | ||
| 721 | ret = 1; | 723 | ret = 1; |
| 724 | } | ||
| 722 | } | 725 | } |
| 723 | return ret; | 726 | return ret; |
| 724 | } | 727 | } |