Commit 67e7d771 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf beauty: Update copy of linux/socket.h with the kernel sources 

To pick the changes in:

  f94fd25c ("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 <kuba@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/all/YqORj9d58AiGYl8b@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent cc214552

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

+6 −1
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ struct linger { 
struct msghdr {

	void		*msg_name;	/* ptr to socket address structure */

	int		msg_namelen;	/* size of socket address structure */



	int		msg_inq;	/* output, data left in socket */



	struct iov_iter	msg_iter;	/* data */



	/*
@@ -62,8 +65,9 @@ struct msghdr { 
		void __user	*msg_control_user;

	};

	bool		msg_control_is_user : 1;

	__kernel_size_t	msg_controllen;	/* ancillary data buffer length */

	bool		msg_get_inq : 1;/* return INQ after receive */

	unsigned int	msg_flags;	/* flags on received message */

	__kernel_size_t	msg_controllen;	/* ancillary data buffer length */

	struct kiocb	*msg_iocb;	/* ptr to iocb for async requests */

};
@@ -434,6 +438,7 @@ extern struct file *do_accept(struct file *file, unsigned file_flags, 
extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,

			 int __user *upeer_addrlen, int flags);

extern int __sys_socket(int family, int type, int protocol);

extern struct file *__sys_socket_file(int family, int type, int protocol);

extern int __sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);

extern int __sys_connect_file(struct file *file, struct sockaddr_storage *addr,

			      int addrlen, int file_flags);