From: Haozhong Zhang <haozhong.zhang@intel.com>
Date: Fri, 7 Apr 2017 13:56:09 +0000 (+0200)
Subject: x86/mce: always re-initialize 'severity_cpu' in mcheck_cmn_handler()
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2278
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6a2c6a68423475cd89a8cc9978554880e5a21b7d;p=xen.git

x86/mce: always re-initialize 'severity_cpu' in mcheck_cmn_handler()

mcheck_cmn_handler() does not always set 'severity_cpu' to override
its value taken from previous rounds of MC handling, which will
interfere the current round of MC handling. Always re-initialize it to
clear the historical value.

Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c
index eb85257d89..51a10ed11e 100644
--- a/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c
@@ -526,6 +526,7 @@ void mcheck_cmn_handler(const struct cpu_user_regs *regs)
             mc_panic(ebuf);
         }
         atomic_set(&found_error, 0);
+        atomic_set(&severity_cpu, -1);
     }
     mce_barrier_exit(&mce_trap_bar);