From: Arnd Bergmann <arnd@arndb.de>
To: y2038@lists.linaro.org, linux-api@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
ink@jurassic.park.msu.ru, 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, 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,
firoz.khan@linaro.org, ebiederm@xmission.com,
deepa.kernel@gmail.com, linux@dominikbrodowski.net,
akpm@linux-foundation.org, dave@stgolabs.net,
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
Subject: [PATCH 05/15] alpha: update syscall macro definitions
Date: Thu, 10 Jan 2019 17:24:25 +0100 [thread overview]
Message-ID: <20190110162435.309262-6-arnd@arndb.de> (raw)
In-Reply-To: <20190110162435.309262-1-arnd@arndb.de>
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.
For shmat, alpha uses the osf_shmat name, we can do the same thing
here, which means we don't have to add an entry in the __IGNORE
list now that shmat is mandatory everywhere
alarm, creat, pause, time, and utime are optional everywhere
these days, no need to list them here any more.
I considered also adding the regular versions of the get*id system
calls that have different names and calling conventions on alpha,
which would further help unify the syscall ABI, but for now
I decided against that.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/alpha/include/asm/unistd.h | 6 ------
arch/alpha/include/uapi/asm/unistd.h | 5 +++++
arch/alpha/kernel/syscalls/syscall.tbl | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index 21b706a5b772..564ba87bdc38 100644
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -22,18 +22,12 @@
/*
* Ignore legacy syscalls that we don't use.
*/
-#define __IGNORE_alarm
-#define __IGNORE_creat
#define __IGNORE_getegid
#define __IGNORE_geteuid
#define __IGNORE_getgid
#define __IGNORE_getpid
#define __IGNORE_getppid
#define __IGNORE_getuid
-#define __IGNORE_pause
-#define __IGNORE_time
-#define __IGNORE_utime
-#define __IGNORE_umount2
/* Alpha doesn't have protection keys. */
#define __IGNORE_pkey_mprotect
diff --git a/arch/alpha/include/uapi/asm/unistd.h b/arch/alpha/include/uapi/asm/unistd.h
index 9ba724f116f1..4507071f995f 100644
--- a/arch/alpha/include/uapi/asm/unistd.h
+++ b/arch/alpha/include/uapi/asm/unistd.h
@@ -2,6 +2,11 @@
#ifndef _UAPI_ALPHA_UNISTD_H
#define _UAPI_ALPHA_UNISTD_H
+/* These are traditionally the names linux-alpha uses for
+ * the two otherwise generic system calls */
+#define __NR_umount __NR_umount2
+#define __NR_osf_shmat __NR_shmat
+
#include <asm/unistd_32.h>
#endif /* _UAPI_ALPHA_UNISTD_H */
diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl
index e09558edae73..f920b65e8c49 100644
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@ -29,7 +29,7 @@
19 common lseek sys_lseek
20 common getxpid sys_getxpid
21 common osf_mount sys_osf_mount
-22 common umount sys_umount
+22 common umount2 sys_umount
23 common setuid sys_setuid
24 common getxuid sys_getxuid
25 common exec_with_loader sys_ni_syscall
@@ -183,7 +183,7 @@
206 common semop sys_semop
207 common osf_utsname sys_osf_utsname
208 common lchown sys_lchown
-209 common osf_shmat sys_shmat
+209 common shmat sys_shmat
210 common shmctl sys_shmctl
211 common shmdt sys_shmdt
212 common shmget sys_shmget
--
2.20.0
next prev parent reply other threads:[~2019-01-10 16:26 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 16:24 [PATCH 00/15] arch: synchronize syscall tables in preparation for y2038 Arnd Bergmann
2019-01-10 16:24 ` [PATCH 01/15] ia64: add __NR_umount2 definition Arnd Bergmann
2019-01-10 16:24 ` [PATCH 02/15] ia64: add statx and io_pgetevents syscalls Arnd Bergmann
2019-01-10 16:24 ` [PATCH 03/15] ia64: assign syscall numbers for perf and seccomp Arnd Bergmann
2019-01-10 16:24 ` [PATCH 04/15] alpha: wire up io_pgetevents system call Arnd Bergmann
2019-01-10 16:24 ` Arnd Bergmann [this message]
2019-01-10 16:24 ` [PATCH 06/15] ARM: add migrate_pages() " Arnd Bergmann
2019-01-10 16:32 ` Will Deacon
2019-01-10 17:11 ` Arnd Bergmann
2019-01-10 16:24 ` [PATCH 07/15] ARM: add kexec_file_load system call number Arnd Bergmann
2019-01-10 16:39 ` Will Deacon
2019-01-10 17:14 ` Arnd Bergmann
2019-01-10 16:24 ` [PATCH 08/15] m68k: assign syscall number for seccomp Arnd Bergmann
2019-01-10 16:24 ` [PATCH 09/15] sh: remove duplicate unistd_32.h file Arnd Bergmann
2019-01-10 16:24 ` [PATCH 10/15] sh: add statx system call Arnd Bergmann
2019-01-10 16:24 ` [PATCH 11/15] mips: fix n32 compat_ipc_parse_version Arnd Bergmann
2019-01-10 16:24 ` [PATCH 12/15] sparc64: fix sparc_ipc type conversion Arnd Bergmann
2019-01-10 16:24 ` [PATCH 13/15] ipc: rename old-style shmctl/semctl/msgctl syscalls Arnd Bergmann
2019-01-10 16:24 ` [PATCH 14/15] arch: add split IPC system calls where needed Arnd Bergmann
2019-01-10 20:32 ` Heiko Carstens
2019-01-11 17:33 ` Arnd Bergmann
2019-01-14 3:40 ` Michael Ellerman
2019-01-14 3:59 ` Michael Ellerman
2019-01-14 9:58 ` Michael Ellerman
2019-01-15 15:01 ` Arnd Bergmann
2019-01-15 15:18 ` Arnd Bergmann
2019-01-15 16:35 ` Geert Uytterhoeven
2019-01-15 21:24 ` Arnd Bergmann
2019-01-16 0:09 ` Michael Ellerman
2019-01-16 0:10 ` Michael Ellerman
2019-01-10 16:24 ` [PATCH 15/15] arch: add pkey and rseq syscall numbers everywhere Arnd Bergmann
2019-01-10 20:36 ` Heiko Carstens
2019-01-11 17:30 ` Arnd Bergmann
2019-01-14 8:31 ` Heiko Carstens
2019-01-15 11:52 ` Russell King - ARM Linux admin
2019-01-15 14:47 ` Arnd Bergmann
2019-01-10 16:59 ` [PATCH 00/15] arch: synchronize syscall tables in preparation for y2038 Geert Uytterhoeven
2019-01-10 17:06 ` Arnd Bergmann
2019-01-10 18:11 ` Geert Uytterhoeven
2019-01-10 22:43 ` Arnd Bergmann
2019-01-11 8:07 ` Geert Uytterhoeven
2019-01-10 18:10 ` Joseph Myers
2019-01-10 22:42 ` Arnd Bergmann
2019-01-10 23:14 ` Michael Cree
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190110162435.309262-6-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=dalias@libc.org \
--cc=dave@stgolabs.net \
--cc=davem@davemloft.net \
--cc=deepa.kernel@gmail.com \
--cc=deller@gmx.de \
--cc=ebiederm@xmission.com \
--cc=fenghua.yu@intel.com \
--cc=firoz.khan@linaro.org \
--cc=geert@linux-m68k.org \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=ink@jurassic.park.msu.ru \
--cc=jcmvbkbc@gmail.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@dominikbrodowski.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=luto@kernel.org \
--cc=mattst88@gmail.com \
--cc=mingo@redhat.com \
--cc=monstr@monstr.eu \
--cc=mpe@ellerman.id.au \
--cc=paul.burton@mips.com \
--cc=schwidefsky@de.ibm.com \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).