diff options
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index a1ab78ceb4b6..3bdb152f412f 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/bootmem.h> | 25 | #include <linux/bootmem.h> |
26 | #include <linux/acpi.h> | 26 | #include <linux/acpi.h> |
27 | #include <linux/tty.h> | 27 | #include <linux/tty.h> |
28 | #include <linux/gfp.h> | ||
29 | #include <linux/percpu.h> | 28 | #include <linux/percpu.h> |
30 | #include <linux/kmod.h> | 29 | #include <linux/kmod.h> |
31 | #include <linux/vmalloc.h> | 30 | #include <linux/vmalloc.h> |
@@ -63,12 +62,14 @@ | |||
63 | #include <linux/sched.h> | 62 | #include <linux/sched.h> |
64 | #include <linux/signal.h> | 63 | #include <linux/signal.h> |
65 | #include <linux/idr.h> | 64 | #include <linux/idr.h> |
65 | #include <linux/kgdb.h> | ||
66 | #include <linux/ftrace.h> | 66 | #include <linux/ftrace.h> |
67 | #include <linux/async.h> | 67 | #include <linux/async.h> |
68 | #include <linux/kmemcheck.h> | 68 | #include <linux/kmemcheck.h> |
69 | #include <linux/kmemtrace.h> | 69 | #include <linux/kmemtrace.h> |
70 | #include <linux/sfi.h> | 70 | #include <linux/sfi.h> |
71 | #include <linux/shmem_fs.h> | 71 | #include <linux/shmem_fs.h> |
72 | #include <linux/slab.h> | ||
72 | #include <trace/boot.h> | 73 | #include <trace/boot.h> |
73 | 74 | ||
74 | #include <asm/io.h> | 75 | #include <asm/io.h> |
@@ -566,7 +567,7 @@ asmlinkage void __init start_kernel(void) | |||
566 | setup_per_cpu_areas(); | 567 | setup_per_cpu_areas(); |
567 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ | 568 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ |
568 | 569 | ||
569 | build_all_zonelists(); | 570 | build_all_zonelists(NULL); |
570 | page_alloc_init(); | 571 | page_alloc_init(); |
571 | 572 | ||
572 | printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line); | 573 | printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line); |
@@ -675,6 +676,7 @@ asmlinkage void __init start_kernel(void) | |||
675 | buffer_init(); | 676 | buffer_init(); |
676 | key_init(); | 677 | key_init(); |
677 | security_init(); | 678 | security_init(); |
679 | dbg_late_init(); | ||
678 | vfs_caches_init(totalram_pages); | 680 | vfs_caches_init(totalram_pages); |
679 | signals_init(); | 681 | signals_init(); |
680 | /* rootfs populating might need page-writeback */ | 682 | /* rootfs populating might need page-writeback */ |
@@ -858,7 +860,7 @@ static int __init kernel_init(void * unused) | |||
858 | /* | 860 | /* |
859 | * init can allocate pages on any node | 861 | * init can allocate pages on any node |
860 | */ | 862 | */ |
861 | set_mems_allowed(node_possible_map); | 863 | set_mems_allowed(node_states[N_HIGH_MEMORY]); |
862 | /* | 864 | /* |
863 | * init can run on any cpu. | 865 | * init can run on any cpu. |
864 | */ | 866 | */ |