Skip to content

Commit

Permalink
perf beauty: Update copy of linux/socket.h with the kernel sources
Browse files Browse the repository at this point in the history
To pick the changes in:

  b5f0de6 ("net: dev: Convert sa_data to flexible array in struct sockaddr")

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

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Jan 18, 2023
1 parent 8c51e8f commit d352588
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tools/perf/trace/beauty/include/linux/socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ typedef __kernel_sa_family_t sa_family_t;

struct sockaddr {
sa_family_t sa_family; /* address family, AF_xxx */
char sa_data[14]; /* 14 bytes of protocol address */
union {
char sa_data_min[14]; /* Minimum 14 bytes of protocol address */
DECLARE_FLEX_ARRAY(char, sa_data);
};
};

struct linger {
Expand Down

0 comments on commit d352588

Please sign in to comment.