diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-03 13:38:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-03 13:38:07 -0700 |
commit | 96d746c68fae9a1e3167caab04c22fd0f677f62d (patch) | |
tree | a2e1d1be86ae7660e00986159987ee3bd1e8f2a3 /init/main.c | |
parent | 95b866d5afcafee00fc9ad70665e48c86d8c4e0f (diff) | |
download | kernel_samsung_smdk4412-96d746c68fae9a1e3167caab04c22fd0f677f62d.zip kernel_samsung_smdk4412-96d746c68fae9a1e3167caab04c22fd0f677f62d.tar.gz kernel_samsung_smdk4412-96d746c68fae9a1e3167caab04c22fd0f677f62d.tar.bz2 |
Fix init/main.c to use regular printk with '%pF' for initcall fn
.. small detail, but the silly e1000e initcall warning debugging caused
me to look at this code. Rather than gouge my eyes out with a spoon, I
just fixed it.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/init/main.c b/init/main.c index f6f7042..3820323 100644 --- a/init/main.c +++ b/init/main.c @@ -708,7 +708,7 @@ int do_one_initcall(initcall_t fn) int result; if (initcall_debug) { - print_fn_descriptor_symbol("calling %s\n", fn); + printk("calling %pF\n", fn); t0 = ktime_get(); } @@ -718,8 +718,8 @@ int do_one_initcall(initcall_t fn) t1 = ktime_get(); delta = ktime_sub(t1, t0); - print_fn_descriptor_symbol("initcall %s", fn); - printk(" returned %d after %Ld msecs\n", result, + printk("initcall %pF returned %d after %Ld msecs\n", + fn, result, (unsigned long long) delta.tv64 >> 20); } @@ -737,8 +737,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; |