aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/trace/kmemtrace.c25
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