1 files changed, 7 insertions, 2 deletions

diff --git a/init/main.c b/init/main.c
index f6204f712e7c..0e7aedeaa05f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -65,6 +65,7 @@
 #include <linux/idr.h>
 #include <linux/ftrace.h>
 #include <linux/async.h>
+#include <linux/kmemcheck.h>
 #include <linux/kmemtrace.h>
 #include <trace/boot.h>
 
@@ -546,6 +547,7 @@ static void __init mm_init(void)
         page_cgroup_init_flatmem();
         mem_init();
         kmem_cache_init();
+        pgtable_cache_init();
         vmalloc_init();
 }
 
@@ -670,7 +672,6 @@ asmlinkage void __init start_kernel(void)
                 initrd_start = 0;
         }
 #endif
-        cpuset_init_early();
         page_cgroup_init();
         enable_debug_pagealloc();
         cpu_hotplug_init();
@@ -684,7 +685,6 @@ asmlinkage void __init start_kernel(void)
                 late_time_init();
         calibrate_delay();
         pidmap_init();
-        pgtable_cache_init();
         anon_vma_init();
 #ifdef CONFIG_X86
         if (efi_enabled)
@@ -867,6 +867,11 @@ static noinline int init_post(void)
 static int __init kernel_init(void * unused)
 {
         lock_kernel();
+
+        /*
+         * init can allocate pages on any node
+         */
+        set_mems_allowed(node_possible_map);
         /*
          * init can run on any cpu.
          */