| From: |
| tip-bot for Adrian Hunter <tipbot-AT-zytor.com> |
| To: |
| linux-tip-commits-AT-vger.kernel.org |
| Subject: |
| [tip:perf/core] perf: Fix broken union in ' struct perf_event_mmap_page' |
| Date: |
| Tue, 23 Jul 2013 20:56:04 -0700 |
| Message-ID: |
| <tip-860f085b74e9f0075de8140ed3a1e5b5e3e39aa8@git.kernel.org> |
| Cc: |
| linux-kernel-AT-vger.kernel.org, hpa-AT-zytor.com, mingo-AT-kernel.org, a.p.zijlstra-AT-chello.nl, adrian.hunter-AT-intel.com, tglx-AT-linutronix.de |
| Archive-link: |
| Article, Thread
|
Commit-ID: 860f085b74e9f0075de8140ed3a1e5b5e3e39aa8
Gitweb: http://git.kernel.org/tip/860f085b74e9f0075de8140ed3a1e5b...
Author: Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Fri, 28 Jun 2013 16:22:17 +0300
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 23 Jul 2013 12:17:10 +0200
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...
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/uapi/linux/perf_event.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 00d8274..0041aed 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;
+ };
};
/*
(
Log in to post comments)
