diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2013-10-18 07:40:08 +0400 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2013-10-18 07:40:08 +0400 |
| commit | 2f8d01a1475cfede058c6a92b5d3dad576da2827 (patch) | |
| tree | e004311de4c4c4075e91ca317a19983e2a612209 /include/uapi/linux | |
| parent | 82ea046c95a3c3ddcfa058c8a270b9afb6e93700 (diff) | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
| download | linux-2f8d01a1475cfede058c6a92b5d3dad576da2827.tar.xz | |
Merge remote-tracking branch 'kvm/next' into kvm-arm-next
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/perf_event.h | 2 |
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, |