diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-25 08:17:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-25 08:17:25 +0100 |
| commit | 2487b6b9bf2874cfca7efb59c95650c5b1d88d43 (patch) | |
| tree | 8bd7a32686e006b1cbeeb80511114c63ac442c87 /tools/include/uapi/asm-generic/socket.h | |
| parent | x86/speculation: Remove the extra #ifdef around CALL_NOSPEC (diff) | |
| parent | x86 boot build: make git ignore stale 'tools' directory (diff) | |
| download | linux-2487b6b9bf2874cfca7efb59c95650c5b1d88d43.tar.gz linux-2487b6b9bf2874cfca7efb59c95650c5b1d88d43.zip | |
Merge branch 'linus' into x86/urgent, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include/uapi/asm-generic/socket.h')
| -rw-r--r-- | tools/include/uapi/asm-generic/socket.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/tools/include/uapi/asm-generic/socket.h b/tools/include/uapi/asm-generic/socket.h index ffff554a5230..aa5016ff3d91 100644 --- a/tools/include/uapi/asm-generic/socket.h +++ b/tools/include/uapi/asm-generic/socket.h @@ -119,14 +119,31 @@ #define SO_DETACH_REUSEPORT_BPF 68 +#define SO_PREFER_BUSY_POLL 69 +#define SO_BUSY_POLL_BUDGET 70 + +#define SO_NETNS_COOKIE 71 + +#define SO_BUF_LOCK 72 + +#define SO_RESERVE_MEM 73 + +#define SO_TXREHASH 74 + #define SO_RCVMARK 75 #define SO_PASSPIDFD 76 #define SO_PEERPIDFD 77 -#define SCM_TS_OPT_ID 78 +#define SO_DEVMEM_LINEAR 78 +#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR +#define SO_DEVMEM_DMABUF 79 +#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF +#define SO_DEVMEM_DONTNEED 80 + +#define SCM_TS_OPT_ID 81 -#define SO_RCVPRIORITY 79 +#define SO_RCVPRIORITY 82 #if !defined(__KERNEL__) |