Skip to content

Commit 6849cbb

Browse files
anna-marialxKAGA-KOKO
authored andcommitted
timer/trace: Replace deprecated vsprintf pointer extension %pf by %ps
Since commit 04b8eb7 ("symbol lookup: introduce dereference_symbol_descriptor()") %pf is deprecated, because %ps is smart enough to handle function pointer dereference on platforms where such a dereference is required. While at it add proper line breaks to stay in the 80 character limit. Signed-off-by: Anna-Maria Gleixner <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Steven Rostedt <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent dc1e7dc commit 6849cbb

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

include/trace/events/timer.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ TRACE_EVENT(timer_start,
7373
__entry->flags = flags;
7474
),
7575

76-
TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
76+
TP_printk("timer=%p function=%ps expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
7777
__entry->timer, __entry->function, __entry->expires,
7878
(long)__entry->expires - __entry->now,
7979
__entry->flags & TIMER_CPUMASK,
@@ -105,7 +105,8 @@ TRACE_EVENT(timer_expire_entry,
105105
__entry->function = timer->function;
106106
),
107107

108-
TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now)
108+
TP_printk("timer=%p function=%ps now=%lu",
109+
__entry->timer, __entry->function, __entry->now)
109110
);
110111

111112
/**
@@ -210,7 +211,7 @@ TRACE_EVENT(hrtimer_start,
210211
__entry->mode = mode;
211212
),
212213

213-
TP_printk("hrtimer=%p function=%pf expires=%llu softexpires=%llu "
214+
TP_printk("hrtimer=%p function=%ps expires=%llu softexpires=%llu "
214215
"mode=%s", __entry->hrtimer, __entry->function,
215216
(unsigned long long) __entry->expires,
216217
(unsigned long long) __entry->softexpires,
@@ -243,7 +244,8 @@ TRACE_EVENT(hrtimer_expire_entry,
243244
__entry->function = hrtimer->function;
244245
),
245246

246-
TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function,
247+
TP_printk("hrtimer=%p function=%ps now=%llu",
248+
__entry->hrtimer, __entry->function,
247249
(unsigned long long) __entry->now)
248250
);
249251

0 commit comments

Comments
 (0)