summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-03-12 03:13:57 (GMT)
committerSteven Rostedt <rostedt@goodmis.org>2015-03-25 12:57:22 (GMT)
commitbbedb179944c29e5e449603163eec9951116fe39 (patch)
tree7ed8b4a90541e710200df3fc6a067c2dfb88f184 /kernel
parent80a9b64e2c156b6523e7a01f2ba6e5d86e722814 (diff)
downloadlinux-bbedb179944c29e5e449603163eec9951116fe39.tar.xz
tracing: %pF is only for function pointers
Use %pS for actual addresses, otherwise you'll get bad output on arches like ppc64 where %pF expects a function descriptor. Link: http://lkml.kernel.org/r/1426130037-17956-22-git-send-email-scottwood@freescale.com Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_entries.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index e2d027a..ee7b94a 100644
--- 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