diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-08-18 21:17:10 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-08-18 21:17:10 -0700 |
| commit | 268603d79cc48dba671e9caf108fab32315b86a2 (patch) | |
| tree | 77466c8c4c104397d1c459674f7a75c4fd60455a /tools/include | |
| parent | 8c78c1e52b0b86bd282c41f3725beabe3c244b94 (diff) | |
| parent | 4c2d0b039c5cc0112206a5b22431b577cb1c57ad (diff) | |
| download | lwn-268603d79cc48dba671e9caf108fab32315b86a2.tar.gz lwn-268603d79cc48dba671e9caf108fab32315b86a2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/linux/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h index 4653834f078f..e2b77fbca91e 100644 --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h @@ -1310,7 +1310,7 @@ union perf_mem_data_src { #define PERF_MEM_SNOOP_SHIFT 19 #define PERF_MEM_SNOOPX_FWD 0x01 /* forward */ -/* 1 free */ +#define PERF_MEM_SNOOPX_PEER 0x02 /* xfer from peer */ #define PERF_MEM_SNOOPX_SHIFT 38 /* locked instruction */ |