perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
HEAD: a8e0108cac181a7b141dacaa99ea52efaf9b5f07 perf: Fix UAPI export of PERF_EVENT_IOC_ID
Two small fixes.
Thanks,
Ingo
------------------>
Peter Zijlstra (1):
perf/x86/intel: Fix Silvermont offcore masks
Vince Weaver (1):
perf: Fix UAPI export of PERF_EVENT_IOC_ID
arch/x86/kernel/cpu/perf_event_intel.c | 4 ++-- include/uapi/linux/perf_event.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +2 -2
@@ -899,8 +899,8 @@ static __initconst const u64 atom_hw_cache_event_idsstatic struct extra_reg intel_slm_extra_regs[]__read_mostly = {/* must define OFFCORE_RSP_X first, see intel_fixup_er() */ -INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0x768005ffff ,RSP_0 ), -INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0x768005ffff ,RSP_1 ), +INTEL_UEVENT_EXTRA_REG (0x01b7 ,MSR_OFFCORE_RSP_0 ,0x768005ffffull ,RSP_0 ), +INTEL_UEVENT_EXTRA_REG (0x02b7 ,MSR_OFFCORE_RSP_1 ,0x768005ffffull ,RSP_1 ),EVENT_EXTRA_END };
include/uapi/linux/perf_event.h +1 -1
@@ -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 ,