From patchwork Fri Jan 18 16:18:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10770921 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70A411880 for ; Fri, 18 Jan 2019 16:22:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60F7B2F894 for ; Fri, 18 Jan 2019 16:22:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F8082F6F5; Fri, 18 Jan 2019 16:22:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA5D92F6F5 for ; Fri, 18 Jan 2019 16:22:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728747AbfARQVN (ORCPT ); Fri, 18 Jan 2019 11:21:13 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:58589 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728697AbfARQVN (ORCPT ); Fri, 18 Jan 2019 11:21:13 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mgek6-1hRG4c1P9I-00h8xD; Fri, 18 Jan 2019 17:19:22 +0100 From: Arnd Bergmann 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 Subject: [PATCH v2 05/29] alpha: update syscall macro definitions Date: Fri, 18 Jan 2019 17:18:11 +0100 Message-Id: <20190118161835.2259170-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190118161835.2259170-1-arnd@arndb.de> References: <20190118161835.2259170-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:IpgN/6x+9YH/ZpCIWY3gRrzUVcyfh4VSAjoJYgiS81Mqfx29mGc tms7FOV7IARrkPsfsZf9kthkrdSPhcU5Fk+5diaWJlZCnlKoqrcwQ86I0j+wmrBl558MOJP W0E7G8LXcyYeqCWEzJ3PmhdsIUaSud+lGO6LI3qmNkMGAFOLvqYAhqIAfIjooAUgxtqYgGq Y0vbQZeedS4Hsd6uRlDsg== X-UI-Out-Filterresults: notjunk:1;V03:K0:J1Y3L6SJOuo=:VItzOi0LywpnZmdssIsomL T2mnwdZYNpu57GUfSTWNptIZxnNK/YWq19yEt/TrIv1Ufo/7Qhmg87+EMdNkzUG7sHHWU6si4 e6Uoc+Se5BpQ0e4+vrNpKWZ8KXDTxR84D6WVcgAb3FljBZbE9GyTnTRHNHrRIb0qu3SrTyBWu EA7cwltkjUvGb/5OSgUGQEpnPwg2MKZgT1hw25LxxHQFO7W6GgpjUd/ZCE9OnxJgtpTZHEWRD 8Ty1u/5QO7fkXZQKTIGyqVcXlcNHnonCrkxxNAEiC0EF109yuPFIk/hWsjOAZxkxPD6LZw2CD LacdpafGZODtV4hOyeceUKO/V10j+2KpzQg7SGxpqOqxV/6KBQ/1ebDjShdMD2/1zA9VA8gnR N3+D48GZa+rXF4UAVWrRs5Rt9+PpmCYGyInuAvwrROOEEdR2PJPYnSDLsUhsLZ13dmR5Il8ot 9SCWdA4V9RdZ/ugKRltpE+xu+QgrrbocjKgnYA9bbmTUxf2oisicIwxN8MzU2HacKf6qdspxx lVIZckAolEYlxaff02IrxkyRNj6qpE+arrYmPN8zYfkV6iworlPh/mQg0GIz6YRr+rQPq44gl Wy9i94kb7ciQMeR72WziFVdG66VUSma7hmvqDIgG5Jp9RiYwyOwP6s38kgL4HKDj6vkN4TLU2 Mh33nR8OVfsKyv776jVob6d/0HDDLFmnbjNvLp2xLJ9V4XJbzDO0uzQrJtj/yaeDsUhY6cz7/ cJ+KbS1MKRzIIHBL9w1MraFpaGTOU56HmRiQrw== Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 #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