OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
06c939c
)
perf: Fix UAPI export of PERF_EVENT_IOC_ID
author
Vince Weaver
<vincent.weaver@maine.edu>
Tue, 17 Sep 2013 18:53:41 +0000
(14:53 -0400)
committer
Ingo Molnar
<mingo@kernel.org>
Wed, 18 Sep 2013 09:29:07 +0000
(11:29 +0200)
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
patch
|
blob
|
history
diff --git
a/include/uapi/linux/perf_event.h
b/include/uapi/linux/perf_event.h
index
ca1d90b
..
40a1fb8
100644
(file)
--- 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,