diff options
author | Petr Mladek <pmladek@suse.com> | 2019-05-06 10:33:10 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2019-05-06 10:33:10 +0200 |
commit | 0f46c78391e1348fe45af86a0cd52795726695af (patch) | |
tree | ee841bfa1178ce5be421c79bed73bb5e72b6d38e /init | |
parent | 35e1547511fcb035437b4527184458adfb0e8f43 (diff) | |
parent | d75f773c86a2b8b7278e2c33343b46a4024bc002 (diff) | |
download | linux-0f46c78391e1348fe45af86a0cd52795726695af.tar.bz2 |
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index c86a1c8f19f4..3192c6cc5382 100644 --- a/init/main.c +++ b/init/main.c @@ -826,7 +826,7 @@ trace_initcall_start_cb(void *data, initcall_t fn) { ktime_t *calltime = (ktime_t *)data; - printk(KERN_DEBUG "calling %pF @ %i\n", fn, task_pid_nr(current)); + printk(KERN_DEBUG "calling %pS @ %i\n", fn, task_pid_nr(current)); *calltime = ktime_get(); } @@ -840,7 +840,7 @@ trace_initcall_finish_cb(void *data, initcall_t fn, int ret) rettime = ktime_get(); delta = ktime_sub(rettime, *calltime); duration = (unsigned long long) ktime_to_ns(delta) >> 10; - printk(KERN_DEBUG "initcall %pF returned %d after %lld usecs\n", + printk(KERN_DEBUG "initcall %pS returned %d after %lld usecs\n", fn, ret, duration); } @@ -897,7 +897,7 @@ int __init_or_module do_one_initcall(initcall_t fn) strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf)); local_irq_enable(); } - WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf); + WARN(msgbuf[0], "initcall %pS returned with %s\n", fn, msgbuf); add_latent_entropy(); return ret; |