Skip to content

Commit a3d1b31

Browse files
committed
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
2 parents 1c84550 + f3d301c commit a3d1b31

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/uapi/linux/perf_event.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,7 @@ union perf_mem_data_src {
11961196

11971197
#define PERF_MEM_SNOOPX_FWD 0x01 /* forward */
11981198
/* 1 free */
1199-
#define PERF_MEM_SNOOPX_SHIFT 37
1199+
#define PERF_MEM_SNOOPX_SHIFT 38
12001200

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

0 commit comments

Comments
 (0)