commit 9d3ec7a0c41d010153c9d20577cb1bcf9c4f65df
author Ingo Molnar <mingo@elte.hu> Fri Sep 30 20:08:56 2011 +0200
committer Ingo Molnar <mingo@elte.hu> Fri Sep 30 20:08:56 2011 +0200
tree 6966bd046c7029df48942bd9cc057f5eccfe5112
parent 47ea91b4052d9e94b9dca5d7a3d947fbebd07ba9
parent 8e303f20f4b3611615118a22a737fd2dc7c4ef81

Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent

tools/perf/util/evsel.c

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index c5748c5..e389815 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -449,6 +449,8 @@
 	}
 
 	if (type & PERF_SAMPLE_RAW) {
+		const u64 *pdata;
+
 		u.val64 = *array;
 		if (WARN_ONCE(swapped,
 			      "Endianness of raw data not corrected!\n")) {
@@ -462,11 +464,12 @@
 			return -EFAULT;
 
 		data->raw_size = u.val32[0];
+		pdata = (void *) array + sizeof(u32);
 
-		if (sample_overlap(event, &u.val32[1], data->raw_size))
+		if (sample_overlap(event, pdata, data->raw_size))
 			return -EFAULT;
 
-		data->raw_data = &u.val32[1];
+		data->raw_data = (void *) pdata;
 	}
 
 	return 0;