projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5cdd40
)
perf: Fix broken union in 'struct perf_event_mmap_page'
author
Adrian Hunter
<adrian.hunter@intel.com>
Fri, 28 Jun 2013 13:22:17 +0000
(16:22 +0300)
committer
Ingo Molnar
<mingo@kernel.org>
Tue, 23 Jul 2013 10:17:10 +0000
(12:17 +0200)
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>
include/uapi/linux/perf_event.h
patch
|
blob
|
history
diff --git
a/include/uapi/linux/perf_event.h
b/include/uapi/linux/perf_event.h
index
00d8274
..
0041aed
100644
(file)
--- 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;
+ };
};
/*