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 f6204f712e7c..5e0d3f047eaf 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -670,7 +670,6 @@ asmlinkage void __init start_kernel(void) | |||
670 | initrd_start = 0; | 670 | initrd_start = 0; |
671 | } | 671 | } |
672 | #endif | 672 | #endif |
673 | cpuset_init_early(); | ||
674 | page_cgroup_init(); | 673 | page_cgroup_init(); |
675 | enable_debug_pagealloc(); | 674 | enable_debug_pagealloc(); |
676 | cpu_hotplug_init(); | 675 | cpu_hotplug_init(); |
@@ -867,6 +866,11 @@ static noinline int init_post(void) | |||
867 | static int __init kernel_init(void * unused) | 866 | static int __init kernel_init(void * unused) |
868 | { | 867 | { |
869 | lock_kernel(); | 868 | lock_kernel(); |
869 | |||
870 | /* | ||
871 | * init can allocate pages on any node | ||
872 | */ | ||
873 | set_mems_allowed(node_possible_map); | ||
870 | /* | 874 | /* |
871 | * init can run on any cpu. | 875 | * init can run on any cpu. |
872 | */ | 876 | */ |