Patch "timer/trace: Replace deprecated vsprintf pointer extension %pf by %ps" has been added to the 4.19-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

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

to the 4.19-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     timer-trace-replace-deprecated-vsprintf-pointer-exte.patch
and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 8bb580146d09a5d90cc57d0a5a3e7e4739a93ab6
Author: Anna-Maria Gleixner <anna-maria@xxxxxxxxxxxxx>
Date:   Thu Mar 21 13:09:20 2019 +0100

    timer/trace: Replace deprecated vsprintf pointer extension %pf by %ps
    
    [ Upstream commit 6849cbb0f9a8dbc1ba56e9abc6955613103e01e3 ]
    
    Since commit 04b8eb7a4ccd ("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 <anna-maria@xxxxxxxxxxxxx>
    Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
    Cc: fweisbec@xxxxxxxxx
    Cc: peterz@xxxxxxxxxxxxx
    Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
    Link: https://lkml.kernel.org/r/20190321120921.16463-4-anna-maria@xxxxxxxxxxxxx
    Stable-dep-of: 0f7352557a35 ("wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
index 350b046e7576c..8f6240854e28f 100644
--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
@@ -73,7 +73,7 @@ TRACE_EVENT(timer_start,
 		__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,
 		  (long)__entry->expires - __entry->now,
 		  __entry->flags & TIMER_CPUMASK,
@@ -105,7 +105,8 @@ TRACE_EVENT(timer_expire_entry,
 		__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,
 		__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,
 		  (unsigned long long) __entry->expires,
 		  (unsigned long long) __entry->softexpires,
@@ -243,7 +244,8 @@ TRACE_EVENT(hrtimer_expire_entry,
 		__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)
 );