[Xen-changelog] [xen-unstable] x86/mca MCA minor bugfix

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Liu, Jinsong <jinsong.liu@xxxxxxxxx>
# Date 1305186767 -3600
# Node ID f69f5836d8c21cf949337cf425defbcca81af30d
# Parent  ab93de9a608df7146ceca38f2b6f65a9a5fad1f2
x86/mca MCA minor bugfix

This patch fix a minor bug, when in xen context and cannot safely
return the mce break point, reset system;

Signed-off-by: Liu, Jinsong <jinsong.liu@xxxxxxxxx>
---


diff -r ab93de9a608d -r f69f5836d8c2 xen/arch/x86/cpu/mcheck/mce_intel.c
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c       Thu May 12 08:52:18 2011 +0100
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c       Thu May 12 08:52:47 2011 +0100
@@ -355,7 +355,7 @@
     gstatus = mca_rdmsr(MSR_IA32_MCG_STATUS);
     /* Xen is not pre-emptible */
     if ( !(gstatus & MCG_STATUS_RIPV) && !guest_mode(regs))
-        return 0;
+        return -1;
 
     return mce_action(regs, mctc) == MCER_RESET ? -1 : 0;
 }
diff -r ab93de9a608d -r f69f5836d8c2 xen/include/public/sysctl.h
--- a/xen/include/public/sysctl.h       Thu May 12 08:52:18 2011 +0100
+++ b/xen/include/public/sysctl.h       Thu May 12 08:52:47 2011 +0100
@@ -410,7 +410,7 @@
 
 #define PG_OFFLINE_MISC_MASK    (0xFFUL << 4)
 
-/* only valid when PG_OFFLINE_FAILED */
+/* valid when PG_OFFLINE_FAILED or PG_OFFLINE_PENDING */
 #define PG_OFFLINE_XENPAGE   (0x1UL << 8)
 #define PG_OFFLINE_DOM0PAGE  (0x1UL << 9)
 #define PG_OFFLINE_ANONYMOUS (0x1UL << 10)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog