From 2e2f117ef2f0cfb140e0937bdc96d4ef6a111900 Mon Sep 17 00:00:00 2001
From: Stephane Eranian <eranian@google.com>
Date: Thu, 9 Feb 2012 16:12:38 +0100
Subject: [PATCH] --- yaml --- r: 288666 b: refs/heads/master c:
 7e1ccd3804281fc0755eb726b654469c40a96d89 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/tools/perf/perf.h      | 1 -
 trunk/tools/perf/util/util.c | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 107183d6d049..588d2a7e1e4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1c67db7e351bf9fd328e368ba045cbeca11d513
+refs/heads/master: 7e1ccd3804281fc0755eb726b654469c40a96d89
diff --git a/trunk/tools/perf/perf.h b/trunk/tools/perf/perf.h
index deb17dba4a5b..03a045618148 100644
--- a/trunk/tools/perf/perf.h
+++ b/trunk/tools/perf/perf.h
@@ -167,7 +167,6 @@ sys_perf_event_open(struct perf_event_attr *attr,
 		      pid_t pid, int cpu, int group_fd,
 		      unsigned long flags)
 {
-	attr->size = sizeof(*attr);
 	return syscall(__NR_perf_event_open, attr, pid, cpu,
 		       group_fd, flags);
 }
diff --git a/trunk/tools/perf/util/util.c b/trunk/tools/perf/util/util.c
index fb25d1329218..8109a907841e 100644
--- a/trunk/tools/perf/util/util.c
+++ b/trunk/tools/perf/util/util.c
@@ -14,6 +14,8 @@ void event_attr_init(struct perf_event_attr *attr)
 		attr->exclude_host  = 1;
 	if (!perf_guest)
 		attr->exclude_guest = 1;
+	/* to capture ABI version */
+	attr->size = sizeof(*attr);
 }
 
 int mkdir_p(char *path, mode_t mode)