[Xen-changelog] [xen-4.0-testing] mce: MCE polling logic should check mce_disabled during

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273742499 -3600
# Node ID a436635d935e3f337bc01f21602ab63e70e4a9a4
# Parent  0f3b8247d88179e4b085e4cbf126d48c9197d60e
mce: MCE polling logic should check mce_disabled during
initialisation.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   21360:fa94385978e6
xen-unstable date:        Wed May 12 09:09:40 2010 +0100
---
 xen/arch/x86/cpu/mcheck/non-fatal.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 0f3b8247d881 -r a436635d935e xen/arch/x86/cpu/mcheck/non-fatal.c
--- a/xen/arch/x86/cpu/mcheck/non-fatal.c       Thu May 13 10:20:57 2010 +0100
+++ b/xen/arch/x86/cpu/mcheck/non-fatal.c       Thu May 13 10:21:39 2010 +0100
@@ -91,7 +91,7 @@ static int __init init_nonfatal_mce_chec
        struct cpuinfo_x86 *c = &boot_cpu_data;
 
        /* Check for MCE support */
-       if (!mce_available(c))
+       if (mce_disabled || !mce_available(c))
                return -ENODEV;
 
        /*

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