lkml.org 
[lkml]   [2020]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v11 1/8] powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro
    Date
    This partially reverts commit caf6f9c8a326 ("asm-generic: Remove
    unneeded __ARCH_WANT_SYS_LLSEEK macro")

    When CONFIG_COMPAT is disabled on ppc64 the kernel does not build.

    There is resistance to both removing the llseek syscall from the 64bit
    syscall tables and building the llseek interface unconditionally.

    Link: https://lore.kernel.org/lkml/20190828151552.GA16855@infradead.org/
    Link: https://lore.kernel.org/lkml/20190829214319.498c7de2@naga/

    Signed-off-by: Michal Suchanek <msuchanek@suse.de>
    Reviewed-by: Arnd Bergmann <arnd@arndb.de>
    ---
    v7: new patch
    ---
    arch/powerpc/include/asm/unistd.h | 1 +
    fs/read_write.c | 3 ++-
    2 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
    index b0720c7c3fcf..700fcdac2e3c 100644
    --- a/arch/powerpc/include/asm/unistd.h
    +++ b/arch/powerpc/include/asm/unistd.h
    @@ -31,6 +31,7 @@
    #define __ARCH_WANT_SYS_SOCKETCALL
    #define __ARCH_WANT_SYS_FADVISE64
    #define __ARCH_WANT_SYS_GETPGRP
    +#define __ARCH_WANT_SYS_LLSEEK
    #define __ARCH_WANT_SYS_NICE
    #define __ARCH_WANT_SYS_OLD_GETRLIMIT
    #define __ARCH_WANT_SYS_OLD_UNAME
    diff --git a/fs/read_write.c b/fs/read_write.c
    index 59d819c5b92e..bbfa9b12b15e 100644
    --- a/fs/read_write.c
    +++ b/fs/read_write.c
    @@ -331,7 +331,8 @@ COMPAT_SYSCALL_DEFINE3(lseek, unsigned int, fd, compat_off_t, offset, unsigned i
    }
    #endif

    -#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT)
    +#if !defined(CONFIG_64BIT) || defined(CONFIG_COMPAT) || \
    + defined(__ARCH_WANT_SYS_LLSEEK)
    SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,
    unsigned long, offset_low, loff_t __user *, result,
    unsigned int, whence)
    --
    2.23.0
    \
     
     \ /
      Last update: 2020-03-19 13:21    [W:7.439 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site