Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / kernel / trace / trace_entries.h

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index e2d027ac66a2d0f79bc1b3959b028a081f1fbc5d..ee7b94a4810af8c85aa4baa246203dc52f588eb6 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -223,7 +223,7 @@ FTRACE_ENTRY(bprint, bprint_entry,
                __dynamic_array(        u32,    buf     )
        ),
 
-       F_printk("%pf: %s",
+       F_printk("%ps: %s",
                 (void *)__entry->ip, __entry->fmt),
 
        FILTER_OTHER
@@ -238,7 +238,7 @@ FTRACE_ENTRY(print, print_entry,
                __dynamic_array(        char,   buf     )
        ),
 
-       F_printk("%pf: %s",
+       F_printk("%ps: %s",
                 (void *)__entry->ip, __entry->buf),
 
        FILTER_OTHER
@@ -253,7 +253,7 @@ FTRACE_ENTRY(bputs, bputs_entry,
                __field(        const char *,   str     )
        ),
 
-       F_printk("%pf: %s",
+       F_printk("%ps: %s",
                 (void *)__entry->ip, __entry->str),
 
        FILTER_OTHER