summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVince Weaver <vincent.weaver@maine.edu>2013-09-17 22:53:41 +0400
committerIngo Molnar <mingo@kernel.org>2013-09-18 13:29:07 +0400
commita8e0108cac181a7b141dacaa99ea52efaf9b5f07 (patch)
tree1dd643b2ed3f9cc830754213a59c4cf398f10b12 /include
parent06c939c1f41b1c28bb17fae074ad610e22a01db8 (diff)
downloadlinux-a8e0108cac181a7b141dacaa99ea52efaf9b5f07.tar.xz
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>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/perf_event.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index ca1d90bcb74d..40a1fb807396 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,