diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-25 11:22:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-25 11:22:59 -0700 |
| commit | a3d1b31213f1f789cc45a7db5c721513282d225a (patch) | |
| tree | 1b00fd0506b0e7b4df145e598c4e772e6fc4e67d | |
| parent | 1c84550f47f35851c5d37405b888ba964053fca1 (diff) | |
| parent | f3d301c1f2f5676465cdf3259737ea19cc82731f (diff) | |
| download | linux-a3d1b31213f1f789cc45a7db5c721513282d225a.tar.gz | |
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
| -rw-r--r-- | include/uapi/linux/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index 077e7ee69e3d..b95d3c485d27 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -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 */ |