Commit a3d1b312 authored by Linus Torvalds's avatar 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
...@@ -1196,7 +1196,7 @@ union perf_mem_data_src { ...@@ -1196,7 +1196,7 @@ union perf_mem_data_src {
#define PERF_MEM_SNOOPX_FWD 0x01 /* forward */ #define PERF_MEM_SNOOPX_FWD 0x01 /* forward */
/* 1 free */ /* 1 free */
#define PERF_MEM_SNOOPX_SHIFT 37 #define PERF_MEM_SNOOPX_SHIFT 38
/* locked instruction */ /* locked instruction */
#define PERF_MEM_LOCK_NA 0x01 /* not available */ #define PERF_MEM_LOCK_NA 0x01 /* not available */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment