Commit 186844b292140d1e33225ec95039b6adb03d3fec
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
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
Showing 2 changed files Side-by-side Diff
arch/x86/kernel/cpu/perf_event_intel.c
| ... | ... | @@ -899,8 +899,8 @@ |
| 899 | 899 | static struct extra_reg intel_slm_extra_regs[] __read_mostly = |
| 900 | 900 | { |
| 901 | 901 | /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ |
| 902 | - INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x768005ffff, RSP_0), | |
| 903 | - INTEL_UEVENT_EXTRA_REG(0x02b7, MSR_OFFCORE_RSP_1, 0x768005ffff, RSP_1), | |
| 902 | + INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x768005ffffull, RSP_0), | |
| 903 | + INTEL_UEVENT_EXTRA_REG(0x02b7, MSR_OFFCORE_RSP_1, 0x768005ffffull, RSP_1), | |
| 904 | 904 | EVENT_EXTRA_END |
| 905 | 905 | }; |
| 906 | 906 |
include/uapi/linux/perf_event.h
| ... | ... | @@ -324,7 +324,7 @@ |
| 324 | 324 | #define PERF_EVENT_IOC_PERIOD _IOW('$', 4, __u64) |
| 325 | 325 | #define PERF_EVENT_IOC_SET_OUTPUT _IO ('$', 5) |
| 326 | 326 | #define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *) |
| 327 | -#define PERF_EVENT_IOC_ID _IOR('$', 7, u64 *) | |
| 327 | +#define PERF_EVENT_IOC_ID _IOR('$', 7, __u64 *) | |
| 328 | 328 | |
| 329 | 329 | enum perf_event_ioc_flags { |
| 330 | 330 | PERF_IOC_FLAG_GROUP = 1U << 0, |