Skip to content

Commit a3eed53

Browse files
committed
perf beauty: Update copy of linux/socket.h with the kernel sources
To pick up the fixes in: 0645fbe ("net: have do_accept() take a struct proto_accept_arg argument") That just changes a function prototype, not touching things used by the perf scrape scripts such as: $ tools/perf/trace/beauty/sockaddr.sh | head -5 static const char *socket_families[] = { [0] = "UNSPEC", [1] = "LOCAL", [2] = "INET", [3] = "AX25", $ This addresses this perf tools build warning: Warning: Kernel ABI header differences: diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/lkml/ZlSrceExgjrUiDb5@x1 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 1437a9f commit a3eed53

File tree

1 file changed

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

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ struct cred;
1616
struct socket;
1717
struct sock;
1818
struct sk_buff;
19+
struct proto_accept_arg;
1920

2021
#define __sockaddr_check_size(size) \
2122
BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
@@ -433,7 +434,7 @@ extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size,
433434
extern int __sys_sendto(int fd, void __user *buff, size_t len,
434435
unsigned int flags, struct sockaddr __user *addr,
435436
int addr_len);
436-
extern struct file *do_accept(struct file *file, unsigned file_flags,
437+
extern struct file *do_accept(struct file *file, struct proto_accept_arg *arg,
437438
struct sockaddr __user *upeer_sockaddr,
438439
int __user *upeer_addrlen, int flags);
439440
extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,

0 commit comments

Comments
 (0)