Commit-ID: 4c49b12853fbb5eff4849b7b6a1e895776f027a1
Gitweb: http://git.kernel.org/tip/4c49b12853fbb5eff4849b7b6a1e895776f027a1
Author: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
AuthorDate: Fri, 13 Nov 2009 21:47:33 -0800
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sat, 14 Nov 2009 10:23:52 +0100
perf_event: Fix invalid type in ioctl definition
u64 is invalid in userspace headers, including ioctl
definitions; use __u64 instead
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
LKML-Reference: <20091113214733.7cd76be9@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
include/linux/perf_event.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 45b56fa..ec3768a 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -219,7 +219,7 @@ struct perf_event_attr {
#define PERF_EVENT_IOC_DISABLE _IO ('$', 1)
#define PERF_EVENT_IOC_REFRESH _IO ('$', 2)
#define PERF_EVENT_IOC_RESET _IO ('$', 3)
-#define PERF_EVENT_IOC_PERIOD _IOW('$', 4, u64)
+#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 *)
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|