summaryrefslogtreecommitdiffstats
path: root/tools/lib/traceevent
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat)2016-02-09 21:40:17 +0100
committerArnaldo Carvalho de Melo2016-03-03 15:10:38 +0100
commita66673a07e260807f570db8f08a9c1207932c665 (patch)
treebd7776a034d2b905f3ead8b70f9cfa1d078a21e7 /tools/lib/traceevent
parenttools lib traceevent: Set int_array fields to NULL if freeing from error (diff)
downloadkernel-qcow2-linux-a66673a07e260807f570db8f08a9c1207932c665.tar.gz
kernel-qcow2-linux-a66673a07e260807f570db8f08a9c1207932c665.tar.xz
kernel-qcow2-linux-a66673a07e260807f570db8f08a9c1207932c665.zip
tools lib traceevent: Fix output of %llu for 64 bit values read on 32 bit machines
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> Cc: Andrew Morton <akpm@linux-foundation.org> Link: http://lkml.kernel.org/r/20160209204237.337024613@goodmis.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/lib/traceevent')
-rw-r--r--tools/lib/traceevent/event-parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index fb790aa757eb..865dea55454b 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4978,7 +4978,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
break;
}
}
- if (pevent->long_size == 8 && ls &&
+ if (pevent->long_size == 8 && ls == 1 &&
sizeof(long) != 8) {
char *p;