From a6f5bc93a5c00681038dc99616b0ed5c7cf4d236 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 15 Dec 2009 19:43:11 +0100 Subject: [PATCH] --- yaml --- r: 177444 b: refs/heads/master c: f13c12c634e124d5d31f912b969d542a016d6105 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/perf_event.h | 12 +++--------- trunk/kernel/perf_event.c | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 0dceea6469d6..7cbed2efeb85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdccc69003388665e1463003f0488cf8ce9cf9e8 +refs/heads/master: f13c12c634e124d5d31f912b969d542a016d6105 diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index 64a53f74c9a9..5fcbf7d2712a 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/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; }; /* diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index 8823b0885183..0dd8e5d02c66 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -4564,7 +4564,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, if (attr->type >= PERF_TYPE_MAX) return -EINVAL; - if (attr->__reserved_1 || attr->__reserved_2 || attr->__reserved_3) + if (attr->__reserved_1 || attr->__reserved_2) return -EINVAL; if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))