ia64: add __NR_umount2 definition

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>

diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 0b08ebd2dfded3847f1683312867432a2347ff69..9ba6110b10b9c0637aaa071d1c7384a13578c578 100644 (file)
--- 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 b2513922dcb5c7672da0512d296f66bf6b913ce5..013e0bcacc39e0254d7fc08c4c0505fa64f36393 100644 (file)
--- 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 b22203b40bfe3147b5c1468c51865b0f27d630f4..e97caf51be420132b9736e514f6fbd8c0fc7d667 100644 (file)
--- 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