diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/init/main.c b/init/main.c index eef30128321a..eb72a5c4c844 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -68,6 +68,7 @@ | |||
68 | #include <linux/shmem_fs.h> | 68 | #include <linux/shmem_fs.h> |
69 | #include <linux/slab.h> | 69 | #include <linux/slab.h> |
70 | #include <linux/perf_event.h> | 70 | #include <linux/perf_event.h> |
71 | #include <linux/file.h> | ||
71 | 72 | ||
72 | #include <asm/io.h> | 73 | #include <asm/io.h> |
73 | #include <asm/bugs.h> | 74 | #include <asm/bugs.h> |
@@ -512,7 +513,7 @@ asmlinkage void __init start_kernel(void) | |||
512 | parse_early_param(); | 513 | parse_early_param(); |
513 | parse_args("Booting kernel", static_command_line, __start___param, | 514 | parse_args("Booting kernel", static_command_line, __start___param, |
514 | __stop___param - __start___param, | 515 | __stop___param - __start___param, |
515 | 0, 0, &unknown_bootoption); | 516 | -1, -1, &unknown_bootoption); |
516 | 517 | ||
517 | jump_label_init(); | 518 | jump_label_init(); |
518 | 519 | ||
@@ -755,13 +756,8 @@ static void __init do_initcalls(void) | |||
755 | { | 756 | { |
756 | int level; | 757 | int level; |
757 | 758 | ||
758 | for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++) { | 759 | for (level = 0; level < ARRAY_SIZE(initcall_levels) - 1; level++) |
759 | pr_info("initlevel:%d=%s, %d registered initcalls\n", | ||
760 | level, initcall_level_names[level], | ||
761 | (int) (initcall_levels[level+1] | ||
762 | - initcall_levels[level])); | ||
763 | do_initcall_level(level); | 760 | do_initcall_level(level); |
764 | } | ||
765 | } | 761 | } |
766 | 762 | ||
767 | /* | 763 | /* |
@@ -809,8 +805,8 @@ static noinline int init_post(void) | |||
809 | system_state = SYSTEM_RUNNING; | 805 | system_state = SYSTEM_RUNNING; |
810 | numa_default_policy(); | 806 | numa_default_policy(); |
811 | 807 | ||
812 | |||
813 | current->signal->flags |= SIGNAL_UNKILLABLE; | 808 | current->signal->flags |= SIGNAL_UNKILLABLE; |
809 | flush_delayed_fput(); | ||
814 | 810 | ||
815 | if (ramdisk_execute_command) { | 811 | if (ramdisk_execute_command) { |
816 | run_init_process(ramdisk_execute_command); | 812 | run_init_process(ramdisk_execute_command); |