From patchwork Thu Jan 10 16:24:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10756123 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 5B27713B4 for ; Thu, 10 Jan 2019 16:26:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B09429A6A for ; Thu, 10 Jan 2019 16:26:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EAEE29C8B; Thu, 10 Jan 2019 16:26:22 +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 CD6F029A6A for ; Thu, 10 Jan 2019 16:26:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729892AbfAJQ0V (ORCPT ); Thu, 10 Jan 2019 11:26:21 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:51797 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729867AbfAJQ0U (ORCPT ); Thu, 10 Jan 2019 11:26:20 -0500 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1M593i-1ggXD93nkq-0017L1; Thu, 10 Jan 2019 17:25:12 +0100 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , 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 Message-Id: <20190110162435.309262-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190110162435.309262-1-arnd@arndb.de> References: <20190110162435.309262-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:JaQTJw5IhBRBC2/6Imn8HYcjqB4MHaiiobuN4ghlkrehtwgL8Rs Om/p9Mvf9KUTv0ovPj+nkYbOjIrQVd59nItiJla5YSaZbq+qloS3HYQZU50BIHllzGR/THF NPHj7ajtaHf9VTmMMB/peuIirgT6VutGHSSeOEkLUTP+R91V9eAfVy/KG9JHW9scAVvyUGQ th8ldIY5dyMjfeLNAPZ1g== X-UI-Out-Filterresults: notjunk:1;V03:K0:bkB9r4Vk1sc=:sJc1qmzUvK0oBRRZONmtJg QBqF1J9G5VStme5ymXgctEjAGseHlpa4zMlH/2h1eSTtExkY8ZV7AhpQwAJeOe7hC6NrrmtwW XOnmkUz1hLorA02NU1es8UVxyXrxBoNCAIPA6t1AKKRR9xGqGIfduZrHbMvwhIIoIgGYR9ir+ gq68RvTao4z313vO6GLbjIxzhz1aZ+lAZ2SiEaekGBP3E2a6eFtZ71cHm2Q0x/bICwE2nliNn V1CfZvH7DNy8QST5cox2a7U/CjrgIV6qfCCH5JHwHttAQUPDTl+XF4lm6FlcA+3F/FPpQM1vk /lnaZT9XgzQbSBcN/68mqCcqr6CLgcjU+7k31xlmkL2F4RlIFDP6mRGeEoS+U7UjnJD4aU6Hq seeuywFX6pwwudzC6zPJ27LxJfH8Cu0g3nr9PAA1T3U1dEUonAJr//jm7RNiJzNAJhAs50TUa dzwijfhGGCNoaxA5IbGWUo5ltlR+Ea1Ff5AaVo2wbXBPhLJsBc5aTYiQoBr6ktL9KpMMLURww GOqGJeE0vY3niN5qlNdJrhIadP/AN9jfICFLFm8x/eC6XlsJE+kKdPWOwIqBS+0OAC5apGNoV o37L/8B5SBOUHm4Xs5l2ue/h6ZiCga8SE/4kOU37Dq+QKMhq+mwwmET2Z+TTRKxTC8ur5HynP 57yz2XdIYW9/avAHM+ANp/KUHDNK3JMLaeNfZYePJBtxzYl49lgPnMs/1hm/N2pxHQJ5UGbuL cUwaMJfdlixeCbGGFJEIS+bwwQfnrFa9zuOyfA== 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