From a495797bf86d9e5018ae91f37ab3fe6d952690eb Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 20 May 2010 10:34:59 +0200
Subject: [PATCH] --- yaml --- r: 199110 b: refs/heads/master c:
 85cb68b27c428d477169f3aa46c72dba103a17bd h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/tools/perf/util/trace-event.h | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 986f3e71ae0b..6c66f84ea6ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49f135ed02828a58b2401f149926c2e3c9cb0116
+refs/heads/master: 85cb68b27c428d477169f3aa46c72dba103a17bd
diff --git a/trunk/tools/perf/util/trace-event.h b/trunk/tools/perf/util/trace-event.h
index 406d452956db..b3e86b1e4444 100644
--- a/trunk/tools/perf/util/trace-event.h
+++ b/trunk/tools/perf/util/trace-event.h
@@ -233,7 +233,12 @@ static inline unsigned long long __data2host8(unsigned long long data)
 
 #define data2host2(ptr)		__data2host2(*(unsigned short *)ptr)
 #define data2host4(ptr)		__data2host4(*(unsigned int *)ptr)
-#define data2host8(ptr)		__data2host8(*(unsigned long long *)ptr)
+#define data2host8(ptr)		({				\
+	unsigned long long __val;				\
+								\
+	memcpy(&__val, (ptr), sizeof(unsigned long long));	\
+	__data2host8(__val);					\
+})
 
 extern int header_page_ts_offset;
 extern int header_page_ts_size;