diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-03-11 23:13:57 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-03-25 08:57:22 -0400 |
| commit | bbedb179944c29e5e449603163eec9951116fe39 (patch) | |
| tree | 7ed8b4a90541e710200df3fc6a067c2dfb88f184 /kernel/trace | |
| parent | 80a9b64e2c156b6523e7a01f2ba6e5d86e722814 (diff) | |
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/trace')
| -rw-r--r-- | kernel/trace/trace_entries.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h index e2d027ac66a2..ee7b94a4810a 100644 --- a/kernel/trace/trace_entries.h +++ b/kernel/trace/trace_entries.h | |||
| @@ -223,7 +223,7 @@ FTRACE_ENTRY(bprint, bprint_entry, | |||
| 223 | __dynamic_array( u32, buf ) | 223 | __dynamic_array( u32, buf ) |
| 224 | ), | 224 | ), |
| 225 | 225 | ||
| 226 | F_printk("%pf: %s", | 226 | F_printk("%ps: %s", |
| 227 | (void *)__entry->ip, __entry->fmt), | 227 | (void *)__entry->ip, __entry->fmt), |
| 228 | 228 | ||
| 229 | FILTER_OTHER | 229 | FILTER_OTHER |
| @@ -238,7 +238,7 @@ FTRACE_ENTRY(print, print_entry, | |||
| 238 | __dynamic_array( char, buf ) | 238 | __dynamic_array( char, buf ) |
| 239 | ), | 239 | ), |
| 240 | 240 | ||
| 241 | F_printk("%pf: %s", | 241 | F_printk("%ps: %s", |
| 242 | (void *)__entry->ip, __entry->buf), | 242 | (void *)__entry->ip, __entry->buf), |
| 243 | 243 | ||
| 244 | FILTER_OTHER | 244 | FILTER_OTHER |
| @@ -253,7 +253,7 @@ FTRACE_ENTRY(bputs, bputs_entry, | |||
| 253 | __field( const char *, str ) | 253 | __field( const char *, str ) |
| 254 | ), | 254 | ), |
| 255 | 255 | ||
| 256 | F_printk("%pf: %s", | 256 | F_printk("%ps: %s", |
| 257 | (void *)__entry->ip, __entry->str), | 257 | (void *)__entry->ip, __entry->str), |
| 258 | 258 | ||
| 259 | FILTER_OTHER | 259 | FILTER_OTHER |
