aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavi Bangoria <ravi.bangoria@linux.vnet.ibm.com>2018-03-15 04:27:56 -0400
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2018-04-11 11:31:07 -0400
commita64b2c01e67eff8b8d0d438507fd0346290697cf (patch)
tree52569fe0d298fe0fb5c023362d5e7a39a46df0f9
parent18d45b11d96e6f9b3814960a1394083a3d6b7f74 (diff)
trace_uprobe: Simplify probes_seq_show()
Simplify probes_seq_show() function. No change in output before and after patch. Link: http://lkml.kernel.org/r/20180315082756.9050-2-ravi.bangoria@linux.vnet.ibm.com Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel/trace/trace_uprobe.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index d7d3c9237f64..21604754bb79 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -602,24 +602,9 @@ static int probes_seq_show(struct seq_file *m, void *v)
602 char c = is_ret_probe(tu) ? 'r' : 'p'; 602 char c = is_ret_probe(tu) ? 'r' : 'p';
603 int i; 603 int i;
604 604
605 seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system, 605 seq_printf(m, "%c:%s/%s %s:0x%0*lx", c, tu->tp.call.class->system,
606 trace_event_name(&tu->tp.call)); 606 trace_event_name(&tu->tp.call), tu->filename,
607 seq_printf(m, " %s:", tu->filename); 607 (int)(sizeof(void *) * 2), tu->offset);
608
609 /* Don't print "0x (null)" when offset is 0 */
610 if (tu->offset) {
611 seq_printf(m, "0x%0*lx", (int)(sizeof(void *) * 2), tu->offset);
612 } else {
613 switch (sizeof(void *)) {
614 case 4:
615 seq_printf(m, "0x00000000");
616 break;
617 case 8:
618 default:
619 seq_printf(m, "0x0000000000000000");
620 break;
621 }
622 }
623 608
624 for (i = 0; i < tu->tp.nr_args; i++) 609 for (i = 0; i < tu->tp.nr_args; i++)
625 seq_printf(m, " %s=%s", tu->tp.args[i].name, tu->tp.args[i].comm); 610 seq_printf(m, " %s=%s", tu->tp.args[i].name, tu->tp.args[i].comm);