[Xen-devel] [PATCH 5] MCA minor bugfix

["Liu, Jinsong" <jinsong.liu@xxxxxxxxx>]

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 59455983fa50 xen/arch/x86/cpu/mcheck/mce_intel.c
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c       Fri May 06 13:56:21 2011 +0800
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c       Fri May 06 14:08:54 2011 +0800
@@ -355,7 +355,7 @@ static int mce_urgent_action(struct cpu_
     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 59455983fa50 xen/include/public/sysctl.h
--- a/xen/include/public/sysctl.h       Fri May 06 13:56:21 2011 +0800
+++ b/xen/include/public/sysctl.h       Fri May 06 14:08:54 2011 +0800
@@ -410,7 +410,7 @@ struct xen_sysctl_page_offline_op {
 
 #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)

Attachment: mca-cleanup-5.patch
Description: mca-cleanup-5.patch

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