“398aa09858ec4dd4165e0c6575cd9da7abf01bba”上不存在“src/windows/git@gitcode.net:openanolis/dragonwell8_jdk.git”
提交 04452204 编写于 作者: A Arnaldo Carvalho de Melo 提交者: Jialin Zhang

perf trace beauty: Update copy of linux/socket.h with the kernel sources

mainline inclusion
from mainline-v5.11-rc1
commit eb2842da
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6BTWC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.2-rc7&id=eb2842da77e1f7a3c46033f930524ab76dffe67a

--------------------------------

This just triggers the rebuilding of the syscall beautifiers that
extract patterns from this file due to this cset:

  b713c195 ("net: provide __sys_shutdown_sock() that takes a socket")

After updating it:

    CC       /tmp/build/perf/trace/beauty/sockaddr.o

Addressing 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

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>

Conflict:
	tools/perf/trace/beauty/include/linux/socket.h
Signed-off-by: NLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: NZhang Yi <yi.zhang@huawei.com>
Reviewed-by: NWang Weiyang <wangweiyang2@huawei.com>
Signed-off-by: NJialin Zhang <zhangjialin11@huawei.com>
上级 68514f17
...@@ -436,5 +436,6 @@ extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr, ...@@ -436,5 +436,6 @@ extern int __sys_getpeername(int fd, struct sockaddr __user *usockaddr,
int __user *usockaddr_len); int __user *usockaddr_len);
extern int __sys_socketpair(int family, int type, int protocol, extern int __sys_socketpair(int family, int type, int protocol,
int __user *usockvec); int __user *usockvec);
extern int __sys_shutdown_sock(struct socket *sock, int how);
extern int __sys_shutdown(int fd, int how); extern int __sys_shutdown(int fd, int how);
#endif /* _LINUX_SOCKET_H */ #endif /* _LINUX_SOCKET_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册