diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 7becd8b5c5bf..7756ddad3c85 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -671,7 +671,6 @@ asmlinkage void __init start_kernel(void) | |||
671 | initrd_start = 0; | 671 | initrd_start = 0; |
672 | } | 672 | } |
673 | #endif | 673 | #endif |
674 | cpuset_init_early(); | ||
675 | page_cgroup_init(); | 674 | page_cgroup_init(); |
676 | enable_debug_pagealloc(); | 675 | enable_debug_pagealloc(); |
677 | cpu_hotplug_init(); | 676 | cpu_hotplug_init(); |
@@ -868,6 +867,11 @@ static noinline int init_post(void) | |||
868 | static int __init kernel_init(void * unused) | 867 | static int __init kernel_init(void * unused) |
869 | { | 868 | { |
870 | lock_kernel(); | 869 | lock_kernel(); |
870 | |||
871 | /* | ||
872 | * init can allocate pages on any node | ||
873 | */ | ||
874 | set_mems_allowed(node_possible_map); | ||
871 | /* | 875 | /* |
872 | * init can run on any cpu. | 876 | * init can run on any cpu. |
873 | */ | 877 | */ |