lkml.org 
[lkml]   [2019]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/15] ia64: add __NR_umount2 definition
    Date
    Other architectures commonly use __NR_umount2 for sys_umount,
    only ia64 and alpha use __NR_umount here. In order to synchronize
    the generated tables, use umount2 like everyone else, and add back
    the old name from asm/unistd.h for compatibility.

    The __IGNORE_* lines are now all obsolete and can be removed as
    a side-effect.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/ia64/include/asm/unistd.h | 14 --------------
    arch/ia64/include/uapi/asm/unistd.h | 2 ++
    arch/ia64/kernel/syscalls/syscall.tbl | 2 +-
    3 files changed, 3 insertions(+), 15 deletions(-)

    diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
    index 0b08ebd2dfde..9ba6110b10b9 100644
    --- a/arch/ia64/include/asm/unistd.h
    +++ b/arch/ia64/include/asm/unistd.h
    @@ -12,20 +12,6 @@

    #define NR_syscalls __NR_syscalls /* length of syscall table */

    -/*
    - * The following defines stop scripts/checksyscalls.sh from complaining about
    - * unimplemented system calls. Glibc provides for each of these by using
    - * more modern equivalent system calls.
    - */
    -#define __IGNORE_fork /* clone() */
    -#define __IGNORE_time /* gettimeofday() */
    -#define __IGNORE_alarm /* setitimer(ITIMER_REAL, ... */
    -#define __IGNORE_pause /* rt_sigprocmask(), rt_sigsuspend() */
    -#define __IGNORE_utime /* utimes() */
    -#define __IGNORE_getpgrp /* getpgid() */
    -#define __IGNORE_vfork /* clone() */
    -#define __IGNORE_umount2 /* umount() */
    -
    #define __ARCH_WANT_NEW_STAT
    #define __ARCH_WANT_SYS_UTIME

    diff --git a/arch/ia64/include/uapi/asm/unistd.h b/arch/ia64/include/uapi/asm/unistd.h
    index b2513922dcb5..013e0bcacc39 100644
    --- a/arch/ia64/include/uapi/asm/unistd.h
    +++ b/arch/ia64/include/uapi/asm/unistd.h
    @@ -15,6 +15,8 @@

    #define __NR_Linux 1024

    +#define __NR_umount __NR_umount2
    +
    #include <asm/unistd_64.h>

    #endif /* _UAPI_ASM_IA64_UNISTD_H */
    diff --git a/arch/ia64/kernel/syscalls/syscall.tbl b/arch/ia64/kernel/syscalls/syscall.tbl
    index b22203b40bfe..e97caf51be42 100644
    --- a/arch/ia64/kernel/syscalls/syscall.tbl
    +++ b/arch/ia64/kernel/syscalls/syscall.tbl
    @@ -29,7 +29,7 @@
    17 common getpid sys_getpid
    18 common getppid sys_getppid
    19 common mount sys_mount
    -20 common umount sys_umount
    +20 common umount2 sys_umount
    21 common setuid sys_setuid
    22 common getuid sys_getuid
    23 common geteuid sys_geteuid
    --
    2.20.0
    \
     
     \ /
      Last update: 2019-01-10 17:30    [W:8.230 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site