diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-01-23 15:56:00 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-01-23 15:56:00 +0300 |
| commit | 91f67b9a6472a243e2c0630f637ddff0af08038e (patch) | |
| tree | 2ba948b5b9a9c13b3494efb3a4006c15db1cbb37 /tools/perf/trace/beauty/include/linux/socket.h | |
| parent | 5670ebf54bd26482f57a094c53bdc562c106e0a9 (diff) | |
| parent | 2475bf0250dee99b477e0c56d7dc9d7ac3f04117 (diff) | |
| download | linux-91f67b9a6472a243e2c0630f637ddff0af08038e.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick fixes that went via perf/urgent.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/trace/beauty/include/linux/socket.h')
| -rw-r--r-- | tools/perf/trace/beauty/include/linux/socket.h | 5 |
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 { |