mce: MCE polling logic should check mce_disabled during initialisation.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/non-fatal.c
index 124d4aa504d103cbd7170592eed4cdc7a35d4f41..2ab2b5cbc25aa56bc25386aac6df480676246054 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/non-fatal.c
+++ b/xen/arch/x86/cpu/mcheck/non-fatal.c
@@ -91,7 +91,7 @@ static int __init init_nonfatal_mce_checker(void)
        struct cpuinfo_x86 *c = &boot_cpu_data;
 
        /* Check for MCE support */
-       if (!mce_available(c))
+       if (mce_disabled || !mce_available(c))
                return -ENODEV;
 
        /*