Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 186844b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 62d228b8 a8e0108c

arch/x86/kernel/cpu/perf_event_intel.c

+2 −2
Original line number Diff line number Diff line
@@ -899,8 +899,8 @@ static __initconst const u64 atom_hw_cache_event_ids 
static 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
Original line number Diff line number Diff line
@@ -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,