Merge branch 'akpm'

[safe/jmp/linux-2.6] / init / main.c

diff --git a/init/main.c b/init/main.c
index 7becd8b..7756dda 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -671,7 +671,6 @@ asmlinkage void __init start_kernel(void)
                initrd_start = 0;
        }
 #endif
-       cpuset_init_early();
        page_cgroup_init();
        enable_debug_pagealloc();
        cpu_hotplug_init();
@@ -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.
         */