From fa456fbe8f81654e4daea191c4bb335fb561fd30 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Tue, 7 Aug 2012 19:43:14 +0200
Subject: [PATCH] --- yaml --- r: 323643 b: refs/heads/master c:
 0cf260131c52f681533d17db6fd07545a3dc184e h: refs/heads/master i:   323641:
 1824e8a1db7cf2b993ea8582db28f7ddceaa4071   323639:
 e6d58596c9b2d04daedd99269a5de837e15c8ac3 v: v3

---
 [refs]                                   | 2 +-
 trunk/tools/lib/traceevent/event-parse.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b0777ccb6c36..212fac70b4e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b527bab59be7ca2154f644fcc4b9e3c267a6d855
+refs/heads/master: 0cf260131c52f681533d17db6fd07545a3dc184e
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index 5f34aa371b56..b7c2c491f61e 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -31,6 +31,7 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <errno.h>
+#include <stdint.h>
 
 #include "event-parse.h"
 #include "event-utils.h"
@@ -3485,7 +3486,7 @@ process_defined_func(struct trace_seq *s, void *data, int size,
 			if (!string->str)
 				die("malloc str");
 
-			args[i] = (unsigned long long)string->str;
+			args[i] = (uintptr_t)string->str;
 			strings = string;
 			trace_seq_destroy(&str);
 			break;