perf: Remove pointless union that wraps the hw breakpoint fields

It stands to anonymize a structure, but structures can already
anonymize by themselves.

Reported-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: "K. Prasad" <prasad@linux.vnet.ibm.com>

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index a61e4de3448b35f6a35f50a7b38e91d0886c0d07..53230e99e9ea805fc74dc7f965f9e6f9522be4f8 100644 (file)
--- a/include/linux/perf_event.h
+++ b/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;