diff options
| author | Adrian Hunter | 2013-06-28 15:22:17 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-07-23 12:17:10 +0200 |
| commit | 860f085b74e9f0075de8140ed3a1e5b5e3e39aa8 (patch) | |
| tree | e566463adab7255ef9192a5e861c1a27bac603b2 /include/uapi/linux/perf_event.h | |
| parent | perf: Update perf_event_type documentation (diff) | |
| download | kernel-qcow2-linux-860f085b74e9f0075de8140ed3a1e5b5e3e39aa8.tar.gz kernel-qcow2-linux-860f085b74e9f0075de8140ed3a1e5b5e3e39aa8.tar.xz kernel-qcow2-linux-860f085b74e9f0075de8140ed3a1e5b5e3e39aa8.zip | |
perf: Fix broken union in 'struct perf_event_mmap_page'
The capabilities bits must not be "union'ed" together.
Put them in a separate struct.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1372425741-1676-2-git-send-email-adrian.hunter@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/perf_event.h')
| -rw-r--r-- | include/uapi/linux/perf_event.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 00d8274730b4..0041aedf2297 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -375,9 +375,11 @@ struct perf_event_mmap_page { __u64 time_running; /* time event on cpu */ union { __u64 capabilities; - __u64 cap_usr_time : 1, - cap_usr_rdpmc : 1, - cap_____res : 62; + struct { + __u64 cap_usr_time : 1, + cap_usr_rdpmc : 1, + cap_____res : 62; + }; }; /* |