X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=init%2Fmain.c;h=0e7aedeaa05f4f56a6737c078331f675201505a1;hb=c868d550115b9ccc0027c67265b9520790f05601;hp=7becd8b5c5bfafab40654a9219eadbee2d158559;hpb=722f2a6c87f34ee0fd0130a8cf45f81e0705594a;p=safe%2Fjmp%2Flinux-2.6

diff --git a/init/main.c b/init/main.c
index 7becd8b..0e7aede 100644
--- a/init/main.c
+++ b/init/main.c
@@ -547,6 +547,7 @@ static void __init mm_init(void)
 	page_cgroup_init_flatmem();
 	mem_init();
 	kmem_cache_init();
+	pgtable_cache_init();
 	vmalloc_init();
 }
 
@@ -671,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();
@@ -685,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)
@@ -868,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.
 	 */