diff options
Diffstat (limited to 'kernel/trace/trace_output.c')
-rw-r--r-- | kernel/trace/trace_output.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 85ecd061c7be..f06fb899b746 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c | |||
@@ -339,8 +339,7 @@ static inline const char *kretprobed(const char *name) | |||
339 | #endif /* CONFIG_KRETPROBES */ | 339 | #endif /* CONFIG_KRETPROBES */ |
340 | 340 | ||
341 | static void | 341 | static void |
342 | seq_print_sym(struct trace_seq *s, const char *fmt, unsigned long address, | 342 | seq_print_sym(struct trace_seq *s, unsigned long address, bool offset) |
343 | bool offset) | ||
344 | { | 343 | { |
345 | char str[KSYM_SYMBOL_LEN]; | 344 | char str[KSYM_SYMBOL_LEN]; |
346 | #ifdef CONFIG_KALLSYMS | 345 | #ifdef CONFIG_KALLSYMS |
@@ -353,12 +352,12 @@ seq_print_sym(struct trace_seq *s, const char *fmt, unsigned long address, | |||
353 | name = kretprobed(str); | 352 | name = kretprobed(str); |
354 | 353 | ||
355 | if (name && strlen(name)) { | 354 | if (name && strlen(name)) { |
356 | trace_seq_printf(s, fmt, name); | 355 | trace_seq_printf(s, "%s", name); |
357 | return; | 356 | return; |
358 | } | 357 | } |
359 | #endif | 358 | #endif |
360 | snprintf(str, KSYM_SYMBOL_LEN, "0x%08lx", address); | 359 | snprintf(str, KSYM_SYMBOL_LEN, "0x%08lx", address); |
361 | trace_seq_printf(s, fmt, str); | 360 | trace_seq_printf(s, "%s", str); |
362 | } | 361 | } |
363 | 362 | ||
364 | #ifndef CONFIG_64BIT | 363 | #ifndef CONFIG_64BIT |
@@ -407,7 +406,7 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags) | |||
407 | goto out; | 406 | goto out; |
408 | } | 407 | } |
409 | 408 | ||
410 | seq_print_sym(s, "%s", ip, sym_flags & TRACE_ITER_SYM_OFFSET); | 409 | seq_print_sym(s, ip, sym_flags & TRACE_ITER_SYM_OFFSET); |
411 | 410 | ||
412 | if (sym_flags & TRACE_ITER_SYM_ADDR) | 411 | if (sym_flags & TRACE_ITER_SYM_ADDR) |
413 | trace_seq_printf(s, " <" IP_FMT ">", ip); | 412 | trace_seq_printf(s, " <" IP_FMT ">", ip); |