Commit a3d1b312 authored Oct 25, 2020 by Linus Torvalds

Merge tag 'perf-urgent-2020-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fix from Thomas Gleixner:
 "A single fix to compute the field offset of the SNOOPX bit in the data
  source bitmask of perf events correctly"

* tag 'perf-urgent-2020-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: correct SNOOPX field offset

parents 1c84550f f3d301c1

include/uapi/linux/perf_event.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1196,7 +1196,7 @@ union perf_mem_data_src {

		#define PERF_MEM_SNOOPX_FWD 0x01 /* forward */
		/* 1 free */
		#define PERF_MEM_SNOOPX_SHIFT 37
		#define PERF_MEM_SNOOPX_SHIFT 38

		/* locked instruction */
		#define PERF_MEM_LOCK_NA 0x01 /* not available */

Admin message