From d188b7a7abb09483f27e81e1e63abe512ce0c9af Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Wed, 22 Aug 2012 10:35:40 +0200
Subject: [PATCH] --- yaml --- r: 323728 b: refs/heads/master c:
 1659d129ed014b715b0b2120e6fd929bdd33ed03 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a68a03ed3fe5..72b40bf6b1fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50a9667c9383982d7ec4e6bbc707f67be0e163d2
+refs/heads/master: 1659d129ed014b715b0b2120e6fd929bdd33ed03
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
index 297ca3db6b4a..28f9cee3fbc3 100644
--- a/trunk/include/linux/perf_event.h
+++ b/trunk/include/linux/perf_event.h
@@ -205,8 +205,8 @@ enum perf_event_read_format {
 #define PERF_ATTR_SIZE_VER0	64	/* sizeof first published struct */
 #define PERF_ATTR_SIZE_VER1	72	/* add: config2 */
 #define PERF_ATTR_SIZE_VER2	80	/* add: branch_sample_type */
-#define PERF_ATTR_SIZE_VER3	88	/* add: sample_regs_user */
-#define PERF_ATTR_SIZE_VER4	96	/* add: sample_stack_user */
+#define PERF_ATTR_SIZE_VER3	96	/* add: sample_regs_user */
+					/* add: sample_stack_user */
 
 /*
  * Hardware event_id to monitor via a performance monitoring event:
diff --git a/trunk/tools/perf/util/header.c b/trunk/tools/perf/util/header.c
index 63aad3109e34..9696e64c9dbd 100644
--- a/trunk/tools/perf/util/header.c
+++ b/trunk/tools/perf/util/header.c
@@ -2011,7 +2011,6 @@ static const int attr_file_abi_sizes[] = {
 	[1] = PERF_ATTR_SIZE_VER1,
 	[2] = PERF_ATTR_SIZE_VER2,
 	[3] = PERF_ATTR_SIZE_VER3,
-	[4] = PERF_ATTR_SIZE_VER4,
 	0,
 };