perf_events: Fix perf_event_attr layout

The miss-alignment of bp_addr created a 32bit hole, causing
different structure packings on 32 and 64 bit machines.

Fix that by moving __reserve_2 into that hole.

Further, remove the useless struct and redundant __bp_reserve
muck.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1260902591.8023.781.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 9 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 64a53f74c9a9..5fcbf7d2712a 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -211,17 +211,11 @@ struct perf_event_attr {
                 __u32           wakeup_watermark; /* bytes before wakeup   */
         };
 
-        struct { /* Hardware breakpoint info */
-                __u64           bp_addr;
-                __u32           bp_type;
-                __u32           bp_len;
-                __u64           __bp_reserved_1;
-                __u64           __bp_reserved_2;
-        };
-
         __u32                   __reserved_2;
 
-        __u64                   __reserved_3;
+        __u64                   bp_addr;
+        __u32                   bp_type;
+        __u32                   bp_len;
 };
 
 /*