Commit 6849cbb0 authored by Anna-Maria Gleixner's avatar Anna-Maria Gleixner Committed by Thomas Gleixner

timer/trace: Replace deprecated vsprintf pointer extension %pf by %ps

Since commit 04b8eb7a ("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: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: fweisbec@gmail.com
Cc: peterz@infradead.org
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: https://lkml.kernel.org/r/20190321120921.16463-4-anna-maria@linutronix.de
parent dc1e7dc5
...@@ -73,7 +73,7 @@ TRACE_EVENT(timer_start, ...@@ -73,7 +73,7 @@ TRACE_EVENT(timer_start,
__entry->flags = flags; __entry->flags = flags;
), ),
TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s", TP_printk("timer=%p function=%ps expires=%lu [timeout=%ld] cpu=%u idx=%u flags=%s",
__entry->timer, __entry->function, __entry->expires, __entry->timer, __entry->function, __entry->expires,
(long)__entry->expires - __entry->now, (long)__entry->expires - __entry->now,
__entry->flags & TIMER_CPUMASK, __entry->flags & TIMER_CPUMASK,
...@@ -105,7 +105,8 @@ TRACE_EVENT(timer_expire_entry, ...@@ -105,7 +105,8 @@ TRACE_EVENT(timer_expire_entry,
__entry->function = timer->function; __entry->function = timer->function;
), ),
TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now) TP_printk("timer=%p function=%ps now=%lu",
__entry->timer, __entry->function, __entry->now)
); );
/** /**
...@@ -210,7 +211,7 @@ TRACE_EVENT(hrtimer_start, ...@@ -210,7 +211,7 @@ TRACE_EVENT(hrtimer_start,
__entry->mode = mode; __entry->mode = mode;
), ),
TP_printk("hrtimer=%p function=%pf expires=%llu softexpires=%llu " TP_printk("hrtimer=%p function=%ps expires=%llu softexpires=%llu "
"mode=%s", __entry->hrtimer, __entry->function, "mode=%s", __entry->hrtimer, __entry->function,
(unsigned long long) __entry->expires, (unsigned long long) __entry->expires,
(unsigned long long) __entry->softexpires, (unsigned long long) __entry->softexpires,
...@@ -243,7 +244,8 @@ TRACE_EVENT(hrtimer_expire_entry, ...@@ -243,7 +244,8 @@ TRACE_EVENT(hrtimer_expire_entry,
__entry->function = hrtimer->function; __entry->function = hrtimer->function;
), ),
TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function, TP_printk("hrtimer=%p function=%ps now=%llu",
__entry->hrtimer, __entry->function,
(unsigned long long) __entry->now) (unsigned long long) __entry->now)
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment