Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[deliverable/linux.git] / init / main.c
index 3f151f6c6da79cd2e28d55ba513aed39b2593923..b28673087ac006e79f4563b1a06d39eb1b163d37 100644 (file)
@@ -502,7 +502,7 @@ asmlinkage void __init start_kernel(void)
        setup_per_cpu_areas();
        smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
 
-       build_all_zonelists(NULL);
+       build_all_zonelists(NULL, NULL);
        page_alloc_init();
 
        printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line);
@@ -725,6 +725,7 @@ static initcall_t *initcall_levels[] __initdata = {
        __initcall_end,
 };
 
+/* Keep these in sync with initcalls in include/linux/init.h */
 static char *initcall_level_names[] __initdata = {
        "early",
        "core",
This page took 0.024769 seconds and 5 git commands to generate.