Merge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index e33e09df3cbc61ad11736776ef4138010df1de8e..6af5470b806761bd477bbeb2b46269e85e22d2b0 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -463,6 +463,10 @@ static void __init mm_init(void)
        percpu_init_late();
        pgtable_cache_init();
        vmalloc_init();
+#ifdef CONFIG_X86
+       if (efi_enabled)
+               efi_enter_virtual_mode();
+#endif
 }
 
 asmlinkage void __init start_kernel(void)
@@ -603,10 +607,6 @@ asmlinkage void __init start_kernel(void)
        calibrate_delay();
        pidmap_init();
        anon_vma_init();
-#ifdef CONFIG_X86
-       if (efi_enabled)
-               efi_enter_virtual_mode();
-#endif
        thread_info_cache_init();
        cred_init();
        fork_init(totalram_pages);
@@ -857,7 +857,7 @@ static void __init kernel_init_freeable(void)
        /*
         * init can allocate pages on any node
         */
-       set_mems_allowed(node_states[N_HIGH_MEMORY]);
+       set_mems_allowed(node_states[N_MEMORY]);
        /*
         * init can run on any cpu.
         */