diff --git a/[refs] b/[refs] index 6cb8307ff410..134e7299d757 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67178767b936fb47a3a5e88097cff41ccbda7acb +refs/heads/master: 4c49b12853fbb5eff4849b7b6a1e895776f027a1 diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index 45b56faf5cdc..ec3768a81058 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/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 *)