Commit b6bd9c7d authored by Scott Wood's avatar Scott Wood Committed by Arnaldo Carvalho de Melo

tools lib traceevent: Support %ps/%pS

Commits such as 65dd297a ("xfs: %pF is only for function
pointers") caused a regression because pretty_print() didn't support
%ps/%pS.  The current %pf/%pF implementation in pretty_print() is what
%ps/%pS is supposed to do, so use the same code for %ps/%pS.

Addressing the incorrect %pf/%pF implementation is beyond the scope of
this patch.
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Dave Chinner <david@fromorbit.com>
Link: http://lkml.kernel.org/r/20150831211637.GA12848@home.buserror.netSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4ba792e3
...@@ -4905,8 +4905,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event ...@@ -4905,8 +4905,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
else else
ls = 2; ls = 2;
if (*(ptr+1) == 'F' || if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||
*(ptr+1) == 'f') { *(ptr+1) == 'S' || *(ptr+1) == 's') {
ptr++; ptr++;
show_func = *ptr; show_func = *ptr;
} else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') { } else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment