Skip to content

Commit d352588

Browse files
committed
perf beauty: Update copy of linux/socket.h with the kernel sources
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 <[email protected]>
1 parent 8c51e8f commit d352588

File tree

1 file changed

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

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ typedef __kernel_sa_family_t sa_family_t;
3333

3434
struct sockaddr {
3535
sa_family_t sa_family; /* address family, AF_xxx */
36-
char sa_data[14]; /* 14 bytes of protocol address */
36+
union {
37+
char sa_data_min[14]; /* Minimum 14 bytes of protocol address */
38+
DECLARE_FLEX_ARRAY(char, sa_data);
39+
};
3740
};
3841

3942
struct linger {

0 commit comments

Comments
 (0)