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

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273742912 -3600
# Node ID 7e9466ec4daef93cc0f593b68850da603d8fe90e
# Parent  86f06849415d7e76beef830f7d9586e5f5a17726
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 86f06849415d -r 7e9466ec4dae xen/arch/x86/cpu/mcheck/non-fatal.c
--- a/xen/arch/x86/cpu/mcheck/non-fatal.c       Thu May 13 10:27:58 2010 +0100
+++ b/xen/arch/x86/cpu/mcheck/non-fatal.c       Thu May 13 10:28:32 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