lkml.org 
[lkml]   [2021]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 144/146] perf beauty: Update copy of linux/socket.h with the kernel sources
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    commit ef83f9efe8461b8fd71eb60b53dbb6a5dd7b39e9 upstream.

    To pick the changes in:

    ea6932d70e223e02 ("net: make get_net_ns return error if NET_NS is disabled")

    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

    Cc: Changbin Du <changbin.du@intel.com>
    Cc: David S. Miller <davem@davemloft.net>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/perf/trace/beauty/include/linux/socket.h | 2 --
    1 file changed, 2 deletions(-)

    --- a/tools/perf/trace/beauty/include/linux/socket.h
    +++ b/tools/perf/trace/beauty/include/linux/socket.h
    @@ -437,6 +437,4 @@ extern int __sys_getpeername(int fd, str
    extern int __sys_socketpair(int family, int type, int protocol,
    int __user *usockvec);
    extern int __sys_shutdown(int fd, int how);
    -
    -extern struct ns_common *get_net_ns(struct ns_common *ns);
    #endif /* _LINUX_SOCKET_H */

    \
     
     \ /
      Last update: 2021-06-21 18:36    [W:2.389 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site