* [patch] uapi perf_event.h has a u64
@ 2013-09-17 18:53 Vince Weaver
2013-09-18 9:34 ` [tip:perf/urgent] perf: Fix UAPI export of PERF_EVENT_IOC_ID tip-bot for Vince Weaver
0 siblings, 1 reply; 2+ messages in thread
From: Vince Weaver @ 2013-09-17 18:53 UTC (permalink / raw)
To: linux-kernel; +Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo
Without the following patch I have problems compiling code using
the new PERF_EVENT_IOC_ID ioctl(). It looks like u64 was used
instead of __u64
Signed-off-by: Vince Weaver <vincent.weaver@maine.edu>
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index ca1d90b..40a1fb8 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -324,7 +324,7 @@ struct perf_event_attr {
#define PERF_EVENT_IOC_PERIOD _IOW('$', 4, __u64)
#define PERF_EVENT_IOC_SET_OUTPUT _IO ('$', 5)
#define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *)
-#define PERF_EVENT_IOC_ID _IOR('$', 7, u64 *)
+#define PERF_EVENT_IOC_ID _IOR('$', 7, __u64 *)
enum perf_event_ioc_flags {
PERF_IOC_FLAG_GROUP = 1U << 0,
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:perf/urgent] perf: Fix UAPI export of PERF_EVENT_IOC_ID
2013-09-17 18:53 [patch] uapi perf_event.h has a u64 Vince Weaver
@ 2013-09-18 9:34 ` tip-bot for Vince Weaver
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Vince Weaver @ 2013-09-18 9:34 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, vincent.weaver, acme, peterz, tglx
Commit-ID: a8e0108cac181a7b141dacaa99ea52efaf9b5f07
Gitweb: http://git.kernel.org/tip/a8e0108cac181a7b141dacaa99ea52efaf9b5f07
Author: Vince Weaver <vincent.weaver@maine.edu>
AuthorDate: Tue, 17 Sep 2013 14:53:41 -0400
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 18 Sep 2013 11:29:07 +0200
perf: Fix UAPI export of PERF_EVENT_IOC_ID
Without the following patch I have problems compiling code using
the new PERF_EVENT_IOC_ID ioctl(). It looks like u64 was used
instead of __u64
Signed-off-by: Vince Weaver <vincent.weaver@maine.edu>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1309171450380.11444@vincent-weaver-1.um.maine.edu
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/uapi/linux/perf_event.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index ca1d90b..40a1fb8 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -324,7 +324,7 @@ struct perf_event_attr {
#define PERF_EVENT_IOC_PERIOD _IOW('$', 4, __u64)
#define PERF_EVENT_IOC_SET_OUTPUT _IO ('$', 5)
#define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *)
-#define PERF_EVENT_IOC_ID _IOR('$', 7, u64 *)
+#define PERF_EVENT_IOC_ID _IOR('$', 7, __u64 *)
enum perf_event_ioc_flags {
PERF_IOC_FLAG_GROUP = 1U << 0,
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-18 9:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-17 18:53 [patch] uapi perf_event.h has a u64 Vince Weaver
2013-09-18 9:34 ` [tip:perf/urgent] perf: Fix UAPI export of PERF_EVENT_IOC_ID tip-bot for Vince Weaver
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).