Merge branch 'perf/urgent' into perf/core, to resolve conflicts

Conflicts:
	tools/perf/builtin-kmem.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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);