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 /kernel/time/timer.c | |
| parent | Merge branch 'for-5.2-vsprintf-hardening' into for-linus (diff) | |
| parent | treewide: Switch printk users from %pf and %pF to %ps and %pS, respectively (diff) | |
| download | linux-0f46c78391e1348fe45af86a0cd52795726695af.tar.gz linux-0f46c78391e1348fe45af86a0cd52795726695af.zip | |
Merge branch 'for-5.2-pf-removal' into for-linus
Diffstat (limited to 'kernel/time/timer.c')
| -rw-r--r-- | kernel/time/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 2fce056f8a49..6502c3ed317e 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1328,7 +1328,7 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(struct timer_list lock_map_release(&lockdep_map); if (count != preempt_count()) { - WARN_ONCE(1, "timer: %pF preempt leak: %08x -> %08x\n", + WARN_ONCE(1, "timer: %pS preempt leak: %08x -> %08x\n", fn, count, preempt_count()); /* * Restore the preempt count. That gives us a decent |