diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-18 20:22:53 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-18 20:22:53 +0400 |
| commit | 186844b292140d1e33225ec95039b6adb03d3fec (patch) | |
| tree | 23665f4d03bd7fea44a1cbe2c8eec7e518ffbafd /include | |
| parent | 62d228b8c676232eca579f91cc0782b060a59097 (diff) | |
| parent | a8e0108cac181a7b141dacaa99ea52efaf9b5f07 (diff) | |
| download | linux-186844b292140d1e33225ec95039b6adb03d3fec.tar.xz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Two small fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Fix UAPI export of PERF_EVENT_IOC_ID
perf/x86/intel: Fix Silvermont offcore masks
Diffstat (limited to 'include')
| -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, |