diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-04 10:24:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-04 10:24:05 +0200 |
| commit | 3588ed2b7c1ef285fa901d95bfd7e45bbddc9044 (patch) | |
| tree | 1bd0e83d2fd04a85cdb51bae607e14a5e51e4d60 /init | |
| parent | da827bea62d62cabfe913e05fc05879faa614af8 (diff) | |
| parent | 2165f631f0e1d4e9a1ee425ef05cb727352285e0 (diff) | |
Merge branch 'linus' into fastboot
Conflicts:
init/main.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 8967835ca93c..2dc22fa2ab17 100644 --- a/init/main.c +++ b/init/main.c @@ -736,8 +736,7 @@ int do_one_initcall(initcall_t fn) local_irq_enable(); } if (msgbuf[0]) { - print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn); - printk(" returned with %s\n", msgbuf); + printk("initcall %pF returned with %s\n", fn, msgbuf); } return result; |