From 9af8a9b616b35bdcfd45576f8b9ca8ee8746bba6 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 25 May 2009 14:45:25 +0200
Subject: [PATCH] --- yaml --- r: 147500 b: refs/heads/master c:
 e527ea312f31e88a7fa5472b71db71c565b0d44f h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/linux/perf_counter.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 60a0b58bbbe2..8ab9b11e7348 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 266dfb0b58bc4181b6158ee63a0069abaa9f3a98
+refs/heads/master: e527ea312f31e88a7fa5472b71db71c565b0d44f
diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h
index 2ddf5e3c5518..b1f2bac09f97 100644
--- a/trunk/include/linux/perf_counter.h
+++ b/trunk/include/linux/perf_counter.h
@@ -154,11 +154,11 @@ struct perf_counter_hw_event {
 
 				__reserved_1   : 51;
 
-	__u32			extra_config_len;
 	__u32			wakeup_events;	/* wakeup every n events */
+	__u32			__reserved_2;
 
-	__u64			__reserved_2;
 	__u64			__reserved_3;
+	__u64			__reserved_4;
 };
 
 /*