From 42d676a5ca681ab4a7b91862889ffefa64df7c22 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 3 Dec 2009 23:16:07 +0100
Subject: [PATCH] --- yaml --- r: 175385 b: refs/heads/master c:
 189f202ed197dc25d627e8660de27ece325e9f68 h: refs/heads/master i:   175383:
 e73e4c0df015e4ca6908b8199422030149bcd7bc v: v3

---
 [refs]                           |  2 +-
 trunk/include/linux/perf_event.h | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0b128f76138c..9cf46e623814 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed54d0f98000ee03310150aa396e9ff8bcb394ce
+refs/heads/master: 189f202ed197dc25d627e8660de27ece325e9f68
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
index a61e4de3448b..53230e99e9ea 100644
--- a/trunk/include/linux/perf_event.h
+++ b/trunk/include/linux/perf_event.h
@@ -215,14 +215,12 @@ struct perf_event_attr {
 		__u32		wakeup_watermark; /* bytes before wakeup   */
 	};
 
-	union {
-		struct { /* Hardware breakpoint info */
-			__u64		bp_addr;
-			__u32		bp_type;
-			__u32		bp_len;
-			__u64		__bp_reserved_1;
-			__u64		__bp_reserved_2;
-		};
+	struct { /* Hardware breakpoint info */
+		__u64		bp_addr;
+		__u32		bp_type;
+		__u32		bp_len;
+		__u64		__bp_reserved_1;
+		__u64		__bp_reserved_2;
 	};
 
 	__u32			__reserved_2;