summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2023-01-18 14:12:23 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2023-01-18 14:12:23 +0100
commitd352588bbc990ba51f925f124946c42e604c502e (patch)
treeab1cb52dc0f7cf9dc30566bc6e99a75e0670eb75 /tools
parenttools headers arm64: Sync arm64's cputype.h with the kernel sources (diff)
downloadlinux-d352588bbc990ba51f925f124946c42e604c502e.tar.xz
linux-d352588bbc990ba51f925f124946c42e604c502e.zip
perf beauty: Update copy of linux/socket.h with the kernel sources
To pick the changes in: b5f0de6df6dce8d6 ("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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/trace/beauty/include/linux/socket.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h
index de3701a2a212..13c3a237b9c9 100644
--- a/tools/perf/trace/beauty/include/linux/socket.h
+++ b/tools/perf/trace/beauty/include/linux/socket.h
@@ -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 {