diff options
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 4 | ||||
| -rw-r--r-- | include/uapi/linux/perf_event.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index c62d88396ad5..9db76c31b3c3 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
| @@ -899,8 +899,8 @@ static __initconst const u64 atom_hw_cache_event_ids | |||
| 899 | static struct extra_reg intel_slm_extra_regs[] __read_mostly = | 899 | static struct extra_reg intel_slm_extra_regs[] __read_mostly = |
| 900 | { | 900 | { |
| 901 | /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ | 901 | /* must define OFFCORE_RSP_X first, see intel_fixup_er() */ |
| 902 | INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x768005ffff, RSP_0), | 902 | INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x768005ffffull, RSP_0), |
| 903 | INTEL_UEVENT_EXTRA_REG(0x02b7, MSR_OFFCORE_RSP_1, 0x768005ffff, RSP_1), | 903 | INTEL_UEVENT_EXTRA_REG(0x02b7, MSR_OFFCORE_RSP_1, 0x768005ffffull, RSP_1), |
| 904 | EVENT_EXTRA_END | 904 | EVENT_EXTRA_END |
| 905 | }; | 905 | }; |
| 906 | 906 | ||
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 { | |||
| 324 | #define PERF_EVENT_IOC_PERIOD _IOW('$', 4, __u64) | 324 | #define PERF_EVENT_IOC_PERIOD _IOW('$', 4, __u64) |
| 325 | #define PERF_EVENT_IOC_SET_OUTPUT _IO ('$', 5) | 325 | #define PERF_EVENT_IOC_SET_OUTPUT _IO ('$', 5) |
| 326 | #define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *) | 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 | enum perf_event_ioc_flags { | 329 | enum perf_event_ioc_flags { |
| 330 | PERF_IOC_FLAG_GROUP = 1U << 0, | 330 | PERF_IOC_FLAG_GROUP = 1U << 0, |