Skip to content

Commit 67e7d77

Browse files
committed
perf beauty: Update copy of linux/socket.h with the kernel sources
To pick the changes in: f94fd25 ("tcp: pass back data left in socket after receive") That don't result in any changes in the tables generated from that header. This silences this perf build warning: Warning: Kernel ABI header at 'tools/perf/trace/beauty/include/linux/socket.h' differs from latest version at 'include/linux/socket.h' diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h Cc: Jakub Kicinski <[email protected]> Cc: Jens Axboe <[email protected]> Link: https://lore.kernel.org/all/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent cc21455 commit 67e7d77

File tree

1 file changed

+6
-1
lines changed
  • tools/perf/trace/beauty/include/linux

1 file changed

+6
-1
lines changed

tools/perf/trace/beauty/include/linux/socket.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ struct linger {
5050
struct msghdr {
5151
void *msg_name; /* ptr to socket address structure */
5252
int msg_namelen; /* size of socket address structure */
53+
54+
int msg_inq; /* output, data left in socket */
55+
5356
struct iov_iter msg_iter; /* data */
5457

5558
/*
@@ -62,8 +65,9 @@ struct msghdr {
6265
void __user *msg_control_user;
6366
};
6467
bool msg_control_is_user : 1;
65-
__kernel_size_t msg_controllen; /* ancillary data buffer length */
68+
bool msg_get_inq : 1;/* return INQ after receive */
6669
unsigned int msg_flags; /* flags on received message */
70+
__kernel_size_t msg_controllen; /* ancillary data buffer length */
6771
struct kiocb *msg_iocb; /* ptr to iocb for async requests */
6872
};
6973

@@ -434,6 +438,7 @@ extern struct file *do_accept(struct file *file, unsigned file_flags,
434438
extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,
435439
int __user *upeer_addrlen, int flags);
436440
extern int __sys_socket(int family, int type, int protocol);
441+
extern struct file *__sys_socket_file(int family, int type, int protocol);
437442
extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);
438443
extern int __sys_connect_file(struct file *file, struct sockaddr_storage *addr,
439444
int addrlen, int file_flags);

0 commit comments

Comments
 (0)