diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2015-11-16 17:25:16 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-02-02 17:29:13 +0000 |
| commit | a62c2e1ed4c4cc95eb1e1ae670246427c0d57083 (patch) | |
| tree | b6e05c52e5aa36f725bb16c1bb4fbf0f81db17de /tools | |
| parent | 2e2e5f3d8769fb913087e6f8d6579145a7bc5829 (diff) | |
| download | linux-stable-a62c2e1ed4c4cc95eb1e1ae670246427c0d57083.tar.gz linux-stable-a62c2e1ed4c4cc95eb1e1ae670246427c0d57083.tar.bz2 linux-stable-a62c2e1ed4c4cc95eb1e1ae670246427c0d57083.zip | |
tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines
commit 32abc2ede536aae52978d6c0a8944eb1df14f460 upstream.
When a long value is read on 32 bit machines for 64 bit output, the
parsing needs to change "%lu" into "%llu", as the value is read
natively.
Unfortunately, if "%llu" is already there, the code will add another "l"
to it and fail to parse it properly.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20151116172516.4b79b109@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/traceevent/event-parse.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 7959d66e1048..6b8769a40acb 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -4399,13 +4399,12 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event sizeof(long) != 8) { char *p; - ls = 2; /* make %l into %ll */ - p = strchr(format, 'l'); - if (p) + if (ls == 1 && (p = strchr(format, 'l'))) memmove(p+1, p, strlen(p)+1); else if (strcmp(format, "%p") == 0) strcpy(format, "0x%llx"); + ls = 2; } switch (ls) { case -2: |