diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-05 14:07:32 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-05 14:07:32 +1000 |
commit | 6d6c4a9162a85ad021c97b1001b046b996a79e95 (patch) | |
tree | 14b66c77a78d8fc734c71e4168422a0c694019b1 /init | |
parent | 0fed4ea63b19cda86bff4b86d6fa25134e1a4c72 (diff) | |
parent | b7574fbc265fdb87458c43fbafb3a05a095337df (diff) |
Merge branch 'quilt/rr'
Diffstat (limited to 'init')
-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 e26916901d9a..bcd975d8532d 100644 --- a/init/main.c +++ b/init/main.c @@ -698,7 +698,7 @@ asmlinkage void __init start_kernel(void) rest_init(); } -static int __initdata initcall_debug; +static int initcall_debug; static int __init initcall_debug_setup(char *str) { @@ -707,7 +707,7 @@ static int __init initcall_debug_setup(char *str) } __setup("initcall_debug", initcall_debug_setup); -static void __init do_one_initcall(initcall_t fn) +int do_one_initcall(initcall_t fn) { int count = preempt_count(); ktime_t t0, t1, delta; @@ -747,6 +747,8 @@ static void __init do_one_initcall(initcall_t fn) print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn); printk(" returned with %s\n", msgbuf); } + + return result; } |