diff options
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 0bc7e167bf45..f6f7042331dc 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -691,7 +691,7 @@ asmlinkage void __init start_kernel(void) | |||
| 691 | rest_init(); | 691 | rest_init(); |
| 692 | } | 692 | } |
| 693 | 693 | ||
| 694 | static int __initdata initcall_debug; | 694 | static int initcall_debug; |
| 695 | 695 | ||
| 696 | static int __init initcall_debug_setup(char *str) | 696 | static int __init initcall_debug_setup(char *str) |
| 697 | { | 697 | { |
| @@ -700,7 +700,7 @@ static int __init initcall_debug_setup(char *str) | |||
| 700 | } | 700 | } |
| 701 | __setup("initcall_debug", initcall_debug_setup); | 701 | __setup("initcall_debug", initcall_debug_setup); |
| 702 | 702 | ||
| 703 | static void __init do_one_initcall(initcall_t fn) | 703 | int do_one_initcall(initcall_t fn) |
| 704 | { | 704 | { |
| 705 | int count = preempt_count(); | 705 | int count = preempt_count(); |
| 706 | ktime_t t0, t1, delta; | 706 | ktime_t t0, t1, delta; |
| @@ -740,6 +740,8 @@ static void __init do_one_initcall(initcall_t fn) | |||
| 740 | print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn); | 740 | print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn); |
| 741 | printk(" returned with %s\n", msgbuf); | 741 | printk(" returned with %s\n", msgbuf); |
| 742 | } | 742 | } |
| 743 | |||
| 744 | return result; | ||
| 743 | } | 745 | } |
| 744 | 746 | ||
| 745 | 747 | ||
