diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-28 09:51:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-28 09:51:34 +0200 |
| commit | 785151f50ddacac06c7a3c5f3d31642794507fdf (patch) | |
| tree | 6159690f38eace5a34a1657631f72adf91d502be /tools/perf/trace/beauty/include/linux/socket.h | |
| parent | 142ba31d8b4aff086c4f080bd97d437232922177 (diff) | |
| parent | b4432656b36e5cc1d50a1f2dc15357543add530e (diff) | |
| download | linux-next-785151f50ddacac06c7a3c5f3d31642794507fdf.tar.gz linux-next-785151f50ddacac06c7a3c5f3d31642794507fdf.zip | |
Merge 6.15-rc4 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/trace/beauty/include/linux/socket.h')
| -rw-r--r-- | tools/perf/trace/beauty/include/linux/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h index d18cc47e89bd..c3322eb3d686 100644 --- a/tools/perf/trace/beauty/include/linux/socket.h +++ b/tools/perf/trace/beauty/include/linux/socket.h @@ -392,6 +392,8 @@ struct ucred { extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); +extern int put_cmsg_notrunc(struct msghdr *msg, int level, int type, int len, + void *data); struct timespec64; struct __kernel_timespec; |