Commit 860f085b authored by Adrian Hunter's avatar Adrian Hunter Committed by Ingo Molnar

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: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1372425741-1676-2-git-send-email-adrian.hunter@intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a5cdd40c
...@@ -375,9 +375,11 @@ struct perf_event_mmap_page { ...@@ -375,9 +375,11 @@ struct perf_event_mmap_page {
__u64 time_running; /* time event on cpu */ __u64 time_running; /* time event on cpu */
union { union {
__u64 capabilities; __u64 capabilities;
__u64 cap_usr_time : 1, struct {
cap_usr_rdpmc : 1, __u64 cap_usr_time : 1,
cap_____res : 62; cap_usr_rdpmc : 1,
cap_____res : 62;
};
}; };
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment