From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH v2 01/29] ia64: add __NR_umount2 definition Date: Fri, 18 Jan 2019 17:18:07 +0100 Message-ID: <20190118161835.2259170-2-arnd@arndb.de> References: <20190118161835.2259170-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190118161835.2259170-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: y2038@lists.linaro.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: dalias@libc.org, linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, jcmvbkbc@gmail.com, deepa.kernel@gmail.com, hpa@zytor.com, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, mpe@ellerman.id.au, deller@gmx.de, x86@kernel.org, linux@armlinux.org.uk, mingo@redhat.com, geert@linux-m68k.org, benh@kernel.crashing.org, firoz.khan@linaro.org, mattst88@gmail.com, fenghua.yu@intel.com, Arnd Bergmann , heiko.carstens@de.ibm.com, linux-fsdevel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, luto@kernel.org, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, monstr@monstr.eu, tony.luck@intel.com, linux-parisc@vger.kernel.org, netdev@vger.kernel.org, linux-mips@vger.kernel.org, paul.burton@mips.com, ebiederm@xmission.com, linux-alpha@vger.kernel.org, schwidefsky@de.ibm.com, akpm@linux-foundation.orglinu List-Id: linux-arch.vger.kernel.org T3RoZXIgYXJjaGl0ZWN0dXJlcyBjb21tb25seSB1c2UgX19OUl91bW91bnQyIGZvciBzeXNfdW1v dW50LApvbmx5IGlhNjQgYW5kIGFscGhhIHVzZSBfX05SX3Vtb3VudCBoZXJlLiBJbiBvcmRlciB0 byBzeW5jaHJvbml6ZQp0aGUgZ2VuZXJhdGVkIHRhYmxlcywgdXNlIHVtb3VudDIgbGlrZSBldmVy eW9uZSBlbHNlLCBhbmQgYWRkIGJhY2sKdGhlIG9sZCBuYW1lIGZyb20gYXNtL3VuaXN0ZC5oIGZv ciBjb21wYXRpYmlsaXR5LgoKVGhlIF9fSUdOT1JFXyogbGluZXMgYXJlIG5vdyBhbGwgb2Jzb2xl dGUgYW5kIGNhbiBiZSByZW1vdmVkIGFzCmEgc2lkZS1lZmZlY3QuCgpTaWduZWQtb2ZmLWJ5OiBB cm5kIEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgotLS0KIGFyY2gvaWE2NC9pbmNsdWRlL2FzbS91 bmlzdGQuaCAgICAgICAgfCAxNCAtLS0tLS0tLS0tLS0tLQogYXJjaC9pYTY0L2luY2x1ZGUvdWFw aS9hc20vdW5pc3RkLmggICB8ICAyICsrCiBhcmNoL2lhNjQva2VybmVsL3N5c2NhbGxzL3N5c2Nh bGwudGJsIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAxNSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL2lhNjQvaW5jbHVkZS9hc20vdW5pc3RkLmggYi9h cmNoL2lhNjQvaW5jbHVkZS9hc20vdW5pc3RkLmgKaW5kZXggMGIwOGViZDJkZmRlLi45YmE2MTEw YjEwYjkgMTAwNjQ0Ci0tLSBhL2FyY2gvaWE2NC9pbmNsdWRlL2FzbS91bmlzdGQuaAorKysgYi9h cmNoL2lhNjQvaW5jbHVkZS9hc20vdW5pc3RkLmgKQEAgLTEyLDIwICsxMiw2IEBACiAKICNkZWZp bmUgTlJfc3lzY2FsbHMJCV9fTlJfc3lzY2FsbHMgLyogbGVuZ3RoIG9mIHN5c2NhbGwgdGFibGUg Ki8KIAotLyoKLSAqIFRoZSBmb2xsb3dpbmcgZGVmaW5lcyBzdG9wIHNjcmlwdHMvY2hlY2tzeXNj YWxscy5zaCBmcm9tIGNvbXBsYWluaW5nIGFib3V0Ci0gKiB1bmltcGxlbWVudGVkIHN5c3RlbSBj YWxscy4gIEdsaWJjIHByb3ZpZGVzIGZvciBlYWNoIG9mIHRoZXNlIGJ5IHVzaW5nCi0gKiBtb3Jl IG1vZGVybiBlcXVpdmFsZW50IHN5c3RlbSBjYWxscy4KLSAqLwotI2RlZmluZSBfX0lHTk9SRV9m b3JrCQkvKiBjbG9uZSgpICovCi0jZGVmaW5lIF9fSUdOT1JFX3RpbWUJCS8qIGdldHRpbWVvZmRh eSgpICovCi0jZGVmaW5lIF9fSUdOT1JFX2FsYXJtCQkvKiBzZXRpdGltZXIoSVRJTUVSX1JFQUws IC4uLiAqLwotI2RlZmluZSBfX0lHTk9SRV9wYXVzZQkJLyogcnRfc2lncHJvY21hc2soKSwgcnRf c2lnc3VzcGVuZCgpICovCi0jZGVmaW5lIF9fSUdOT1JFX3V0aW1lCQkvKiB1dGltZXMoKSAqLwot I2RlZmluZSBfX0lHTk9SRV9nZXRwZ3JwCS8qIGdldHBnaWQoKSAqLwotI2RlZmluZSBfX0lHTk9S RV92Zm9yawkJLyogY2xvbmUoKSAqLwotI2RlZmluZSBfX0lHTk9SRV91bW91bnQyCS8qIHVtb3Vu dCgpICovCi0KICNkZWZpbmUgX19BUkNIX1dBTlRfTkVXX1NUQVQKICNkZWZpbmUgX19BUkNIX1dB TlRfU1lTX1VUSU1FCiAKZGlmZiAtLWdpdCBhL2FyY2gvaWE2NC9pbmNsdWRlL3VhcGkvYXNtL3Vu aXN0ZC5oIGIvYXJjaC9pYTY0L2luY2x1ZGUvdWFwaS9hc20vdW5pc3RkLmgKaW5kZXggYjI1MTM5 MjJkY2I1Li4wMTNlMGJjYWNjMzkgMTAwNjQ0Ci0tLSBhL2FyY2gvaWE2NC9pbmNsdWRlL3VhcGkv YXNtL3VuaXN0ZC5oCisrKyBiL2FyY2gvaWE2NC9pbmNsdWRlL3VhcGkvYXNtL3VuaXN0ZC5oCkBA IC0xNSw2ICsxNSw4IEBACiAKICNkZWZpbmUgX19OUl9MaW51eCAgICAgIDEwMjQKIAorI2RlZmlu ZSBfX05SX3Vtb3VudCBfX05SX3Vtb3VudDIKKwogI2luY2x1ZGUgPGFzbS91bmlzdGRfNjQuaD4K IAogI2VuZGlmIC8qIF9VQVBJX0FTTV9JQTY0X1VOSVNURF9IICovCmRpZmYgLS1naXQgYS9hcmNo L2lhNjQva2VybmVsL3N5c2NhbGxzL3N5c2NhbGwudGJsIGIvYXJjaC9pYTY0L2tlcm5lbC9zeXNj YWxscy9zeXNjYWxsLnRibAppbmRleCBiMjIyMDNiNDBiZmUuLmU5N2NhZjUxYmU0MiAxMDA2NDQK LS0tIGEvYXJjaC9pYTY0L2tlcm5lbC9zeXNjYWxscy9zeXNjYWxsLnRibAorKysgYi9hcmNoL2lh NjQva2VybmVsL3N5c2NhbGxzL3N5c2NhbGwudGJsCkBAIC0yOSw3ICsyOSw3IEBACiAxNwljb21t b24JZ2V0cGlkCQkJCXN5c19nZXRwaWQKIDE4CWNvbW1vbglnZXRwcGlkCQkJCXN5c19nZXRwcGlk CiAxOQljb21tb24JbW91bnQJCQkJc3lzX21vdW50Ci0yMAljb21tb24JdW1vdW50CQkJCXN5c191 bW91bnQKKzIwCWNvbW1vbgl1bW91bnQyCQkJCXN5c191bW91bnQKIDIxCWNvbW1vbglzZXR1aWQJ CQkJc3lzX3NldHVpZAogMjIJY29tbW9uCWdldHVpZAkJCQlzeXNfZ2V0dWlkCiAyMwljb21tb24J Z2V0ZXVpZAkJCQlzeXNfZ2V0ZXVpZAotLSAKMi4yMC4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpZMjAzOCBtYWlsaW5nIGxpc3QKWTIwMzhAbGlzdHMu bGluYXJvLm9yZwpodHRwczovL2xpc3RzLmxpbmFyby5vcmcvbWFpbG1hbi9saXN0aW5mby95MjAz OAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de ([212.227.17.10]:59237 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728341AbfARQUl (ORCPT ); Fri, 18 Jan 2019 11:20:41 -0500 From: Arnd Bergmann Subject: [PATCH v2 01/29] ia64: add __NR_umount2 definition Date: Fri, 18 Jan 2019 17:18:07 +0100 Message-ID: <20190118161835.2259170-2-arnd@arndb.de> In-Reply-To: <20190118161835.2259170-1-arnd@arndb.de> References: <20190118161835.2259170-1-arnd@arndb.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: y2038@lists.linaro.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Arnd Bergmann , mattst88@gmail.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, tony.luck@intel.com, fenghua.yu@intel.com, geert@linux-m68k.org, monstr@monstr.eu, paul.burton@mips.com, deller@gmx.de, benh@kernel.crashing.org, mpe@ellerman.id.au, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, dalias@libc.org, davem@davemloft.net, luto@kernel.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, jcmvbkbc@gmail.com, akpm@linux-foundation.org, deepa.kernel@gmail.com, ebiederm@xmission.com, firoz.khan@linaro.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org Message-ID: <20190118161807.SsnvA3fH9zenxLnL7F2OBoGUcZuAythQlMX_lXsr_TE@z> 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 --- 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 #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