mcheck: Small fix for CMCI Threshold set problem.

When generating new threshold value, we must firstly clean old value
before or the new set value since the new value might be different
with the old (BIOS might pre-set some threshold).

Signed-off-by: Liping Ke <liping.ke@intel.com>
Signed-off-by: Ying Huang <ying.huang@intel.com>
xen-unstable changeset:   21081:af86222ddaeb
xen-unstable date:        Tue Mar 30 08:32:34 2010 +0100

diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c
index 6bf8c87addf260ed57ecdec77e29461e993cc0d9..bfd15f3cf606c70e1051684c0983796ac77005f6 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c
@@ -548,6 +548,8 @@ static int do_cmci_discover(int i)
         clear_bit(i, __get_cpu_var(mce_banks_owned));
         goto out;
     }
+
+    val &= ~CMCI_THRESHOLD_MASK;
     wrmsrl(msr, val | CMCI_EN | CMCI_THRESHOLD);
     rdmsrl(msr, val);