redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Linus Torvalds 2008-10-03 13:38:07 -07:00
parent 95b866d5af
commit 96d746c68f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
init/main.c
View File

@ -708,7 +708,7 @@ int do_one_initcall(initcall_t fn)
int result; int result;
if (initcall_debug) { if (initcall_debug) {
print_fn_descriptor_symbol("calling %s\n", fn); printk("calling %pF\n", fn);
t0 = ktime_get(); t0 = ktime_get();
} }
@ -718,8 +718,8 @@ int do_one_initcall(initcall_t fn)
t1 = ktime_get(); t1 = ktime_get();
delta = ktime_sub(t1, t0); delta = ktime_sub(t1, t0);
print_fn_descriptor_symbol("initcall %s", fn); printk("initcall %pF returned %d after %Ld msecs\n",
printk(" returned %d after %Ld msecs\n", result, fn, result,
(unsigned long long) delta.tv64 >> 20); (unsigned long long) delta.tv64 >> 20);
} }
@ -737,8 +737,7 @@ int do_one_initcall(initcall_t fn)
local_irq_enable(); local_irq_enable();
} }
if (msgbuf[0]) { if (msgbuf[0]) {
print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn); printk("initcall %pF returned with %s\n", fn, msgbuf);
printk(" returned with %s\n", msgbuf);
} }
return result; return result;