diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-07-08 22:46:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-07-10 06:07:20 -0400 |
commit | 6a167c655858cbec4175532fd00417661c87f149 (patch) | |
tree | f177c7a7ea5a6c949bf7f4cc37cebb5665e38ed1 /kernel/trace/kmemtrace.c | |
parent | 68baafcfc46074c4bb4e4c3115c2c76a8a85f37d (diff) |
tracing/kmemtrace: Use the %pf format
Remove the obsolete seq_print_ip_sym() usage and replace it
by the %pf format in order to print function symbols.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
LKML-Reference: <1247107590-6428-3-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/kmemtrace.c')
-rw-r--r-- | kernel/trace/kmemtrace.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c index 74903b62bcb6..2f6fa47d410c 100644 --- a/kernel/trace/kmemtrace.c +++ b/kernel/trace/kmemtrace.c | |||
@@ -389,19 +389,12 @@ kmemtrace_print_alloc_compress(struct trace_iterator *iter) | |||
389 | if (!ret) | 389 | if (!ret) |
390 | return TRACE_TYPE_PARTIAL_LINE; | 390 | return TRACE_TYPE_PARTIAL_LINE; |
391 | 391 | ||
392 | /* Node */ | 392 | /* Node and call site*/ |
393 | ret = trace_seq_printf(s, "%4d ", entry->node); | 393 | ret = trace_seq_printf(s, "%4d %pf\n", entry->node, |
394 | (void *)entry->call_site); | ||
394 | if (!ret) | 395 | if (!ret) |
395 | return TRACE_TYPE_PARTIAL_LINE; | 396 | return TRACE_TYPE_PARTIAL_LINE; |
396 | 397 | ||
397 | /* Call site */ | ||
398 | ret = seq_print_ip_sym(s, entry->call_site, 0); | ||
399 | if (!ret) | ||
400 | return TRACE_TYPE_PARTIAL_LINE; | ||
401 | |||
402 | if (!trace_seq_printf(s, "\n")) | ||
403 | return TRACE_TYPE_PARTIAL_LINE; | ||
404 | |||
405 | return TRACE_TYPE_HANDLED; | 398 | return TRACE_TYPE_HANDLED; |
406 | } | 399 | } |
407 | 400 | ||
@@ -447,19 +440,11 @@ kmemtrace_print_free_compress(struct trace_iterator *iter) | |||
447 | if (!ret) | 440 | if (!ret) |
448 | return TRACE_TYPE_PARTIAL_LINE; | 441 | return TRACE_TYPE_PARTIAL_LINE; |
449 | 442 | ||
450 | /* Skip node */ | 443 | /* Skip node and print call site*/ |
451 | ret = trace_seq_printf(s, " "); | 444 | ret = trace_seq_printf(s, " %pf\n", (void *)entry->call_site); |
452 | if (!ret) | 445 | if (!ret) |
453 | return TRACE_TYPE_PARTIAL_LINE; | 446 | return TRACE_TYPE_PARTIAL_LINE; |
454 | 447 | ||
455 | /* Call site */ | ||
456 | ret = seq_print_ip_sym(s, entry->call_site, 0); | ||
457 | if (!ret) | ||
458 | return TRACE_TYPE_PARTIAL_LINE; | ||
459 | |||
460 | if (!trace_seq_printf(s, "\n")) | ||
461 | return TRACE_TYPE_PARTIAL_LINE; | ||
462 | |||
463 | return TRACE_TYPE_HANDLED; | 448 | return TRACE_TYPE_HANDLED; |
464 | } | 449 | } |
465 | 450 | ||