diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-11 12:56:27 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-11 12:56:27 +0300 |
| commit | f7dc7fd1c08c6d8109688694fd93d80645df89ff (patch) | |
| tree | 255e1e24bcf089d584e45ea8a733883c1bb4d74c /tools/lib/traceevent | |
| parent | 32b0ed3ae66cd6114f8510161f833f05518c0395 (diff) | |
| parent | 44b11fee51711ca85aa2b121a49bf029d18a3722 (diff) | |
| download | linux-f7dc7fd1c08c6d8109688694fd93d80645df89ff.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to resolve conflicts
Conflicts:
tools/perf/builtin-kmem.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib/traceevent')
| -rw-r--r-- | tools/lib/traceevent/event-parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index e29e4f81a40d..cc25f059ab3d 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -3865,7 +3865,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, } else if (el_size == 4) { trace_seq_printf(s, "%u", *(uint32_t *)num); } else if (el_size == 8) { - trace_seq_printf(s, "%lu", *(uint64_t *)num); + trace_seq_printf(s, "%"PRIu64, *(uint64_t *)num); } else { trace_seq_printf(s, "BAD SIZE:%d 0x%x", el_size, *(uint8_t *)num); |