Merge tag 'v3.8-rc5' into x86/mm

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / lguest / boot.c

diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 139dd353c2f21282cdb07c9f875823669c54013a..1cbd89ca5569f2ce5d76a4bed1f21d6d52ed63e5 100644 (file)
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -1413,7 +1413,7 @@ __init void lguest_init(void)
 
        /* We don't have features.  We have puppies!  Puppies! */
 #ifdef CONFIG_X86_MCE
-       mce_disabled = 1;
+       mca_cfg.disabled = true;
 #endif
 #ifdef CONFIG_ACPI
        acpi_disabled = 1;