lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 181/258] tools uapi asm: Update asm-generic/unistd.h copy
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    [ Upstream commit 89a0948984896352cac1ebe079cb3d64d6c3adc6 ]

    To get the change in:

    b7d624ab4312 ("asm-generic: unistd.h: fixup broken macro include.")

    That doesn't imply in any changes in the tools.

    This silences the following perf build warning:

    Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/unistd.h' differs from latest version at 'include/uapi/asm-generic/unistd.h'
    diff -u tools/include/uapi/asm-generic/unistd.h include/uapi/asm-generic/unistd.h

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Guo Ren <ren_guo@c-sky.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Link: https://lkml.kernel.org/n/tip-2e7xwm5i2qcc88jp2lyawdyd@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/include/uapi/asm-generic/unistd.h | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h
    index df4bedb9b01c..1e4e48355eda 100644
    --- a/tools/include/uapi/asm-generic/unistd.h
    +++ b/tools/include/uapi/asm-generic/unistd.h
    @@ -758,8 +758,10 @@ __SYSCALL(__NR_rseq, sys_rseq)
    #define __NR_ftruncate __NR3264_ftruncate
    #define __NR_lseek __NR3264_lseek
    #define __NR_sendfile __NR3264_sendfile
    +#if defined(__ARCH_WANT_NEW_STAT) || defined(__ARCH_WANT_STAT64)
    #define __NR_newfstatat __NR3264_fstatat
    #define __NR_fstat __NR3264_fstat
    +#endif
    #define __NR_mmap __NR3264_mmap
    #define __NR_fadvise64 __NR3264_fadvise64
    #ifdef __NR3264_stat
    @@ -774,8 +776,10 @@ __SYSCALL(__NR_rseq, sys_rseq)
    #define __NR_ftruncate64 __NR3264_ftruncate
    #define __NR_llseek __NR3264_lseek
    #define __NR_sendfile64 __NR3264_sendfile
    +#if defined(__ARCH_WANT_NEW_STAT) || defined(__ARCH_WANT_STAT64)
    #define __NR_fstatat64 __NR3264_fstatat
    #define __NR_fstat64 __NR3264_fstat
    +#endif
    #define __NR_mmap2 __NR3264_mmap
    #define __NR_fadvise64_64 __NR3264_fadvise64
    #ifdef __NR3264_stat
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-01-28 18:14    [W:3.037 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site