diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-19 14:50:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-19 14:50:43 -0700 |
| commit | 913ec3c22ef425d63dd0bc81fb008ce7f9bcb07b (patch) | |
| tree | eaafcad81dd6a2de2b25fdc8f73ef9fc82073347 /tools/perf/trace/beauty/include/linux/socket.h | |
| parent | d9403d307dba1a71ee6462b22300c2d3be773b1c (diff) | |
| parent | 1792a59eab9593de2eae36c40c5a22d70f52c026 (diff) | |
| download | linux-913ec3c22ef425d63dd0bc81fb008ce7f9bcb07b.tar.gz linux-913ec3c22ef425d63dd0bc81fb008ce7f9bcb07b.tar.bz2 linux-913ec3c22ef425d63dd0bc81fb008ce7f9bcb07b.zip | |
Merge tag 'perf-tools-fixes-for-v5.13-2021-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
Pull perf tools fixes from Arnaldo Carvalho de Melo:
- Fix refcount usage when processing PERF_RECORD_KSYMBOL.
- 'perf stat' metric group fixes.
- Fix 'perf test' non-bash issue with stat bpf counters.
- Update unistd, in.h and socket.h with the kernel sources, silencing
perf build warnings.
* tag 'perf-tools-fixes-for-v5.13-2021-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
tools headers UAPI: Sync linux/in.h copy with the kernel sources
tools headers UAPI: Sync asm-generic/unistd.h with the kernel original
perf beauty: Update copy of linux/socket.h with the kernel sources
perf test: Fix non-bash issue with stat bpf counters
perf machine: Fix refcount usage when processing PERF_RECORD_KSYMBOL
perf metricgroup: Return error code from metricgroup__add_metric_sys_event_iter()
perf metricgroup: Fix find_evsel_group() event selector
Diffstat (limited to 'tools/perf/trace/beauty/include/linux/socket.h')
| -rw-r--r-- | tools/perf/trace/beauty/include/linux/socket.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/trace/beauty/include/linux/socket.h b/tools/perf/trace/beauty/include/linux/socket.h index b8fc5c53ba6f..0d8e3dcb7f88 100644 --- a/tools/perf/trace/beauty/include/linux/socket.h +++ b/tools/perf/trace/beauty/include/linux/socket.h @@ -438,6 +438,4 @@ extern int __sys_socketpair(int family, int type, int protocol, int __user *usockvec); extern int __sys_shutdown_sock(struct socket *sock, int how); extern int __sys_shutdown(int fd, int how); - -extern struct ns_common *get_net_ns(struct ns_common *ns); #endif /* _LINUX_SOCKET_H */ |