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

[karo-tx-linux.git] / arch / x86 / lguest / boot.c

diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 642d8805bc1bb967f03715d3585a9cd0fa99e5bb..1cbd89ca5569f2ce5d76a4bed1f21d6d52ed63e5 100644 (file)
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -552,7 +552,8 @@ static void lguest_write_cr3(unsigned long cr3)
        current_cr3 = cr3;
 
        /* These two page tables are simple, linear, and used during boot */
-       if (cr3 != __pa(swapper_pg_dir) && cr3 != __pa(initial_page_table))
+       if (cr3 != __pa_symbol(swapper_pg_dir) &&
+           cr3 != __pa_symbol(initial_page_table))
                cr3_changed = true;
 }
 
@@ -1412,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;