From patchwork Wed Jan 2 15:52:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Firoz Khan X-Patchwork-Id: 154672 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp313099ljp; Wed, 2 Jan 2019 07:53:23 -0800 (PST) X-Google-Smtp-Source: ALg8bN7usn25uoXPSPRfxZU7DE2Xi5XNJUGiGvh8jkJaE1lymOjYKY8DIQ4vvfefjbCOymhpS53c X-Received: by 2002:a17:902:7791:: with SMTP id o17mr43163292pll.60.1546444403019; Wed, 02 Jan 2019 07:53:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546444403; cv=none; d=google.com; s=arc-20160816; b=Kvj4gCOGt14ElsdZd+rn0n/WDmg2GfXLeyof0yhKICSkpTckyYBTWIax4OMHy6XexM tCyGCoI9f6rLe4zwPorfufL4d9dGXFpN+k06yLjES+5mEidFymszsQD6e00Jopy4rKmB G/jAVpnld8fiJBjP+2xRTPma6v2E4id8h+E567hLB8tl0NixRbz9fDQZ3AUQNu+GMTSL vc6vb33vCBhQrx8zkKNIamG/aTBJxUNdryjztOIzKmHhliL9opDBoaeUeVQgyYO4Xogc FOjEm2R2OAySltZzUpB4AT2+ONj97Ba0zlKaBzONtxqctvt+KA43bZJ5P+0r0n7Yhy3L E1wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=O3oktLmRrcQkvmGvrxjx/dlqIUCFKJqlZmJSB7MMuho=; b=KjIZjR+pPlY4zZlKrCFuYDVWbnpEeAlmZsybvlux0RSOxI46nQuxRythwck1cBnfKQ UyPGN5AlkXjkKnE5V8tVOp5j8EewilYOzi+s7K2x3A+1ScoNsnRVe1NufRaSt/lIrrt7 iJjyIc1ft4mDGNtotVVvREtz20bm/FrFJZ9thanG7RjpmAmai6RA9uteIQLwt8z2XPBw yi3DcP29XB1X3UbFRQwQQ1XH0IKq4jEjooXwbnestWuytHgFD9OE75zOVzIgKvwdU2yg CshhB6i5/sFwiY4kWC2uaiVcbFmKpg6EI48lqMexlTWTBTmdwLMM3SRlM6gPaiM0valk T2hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E5HYm087; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x11si47377012plv.321.2019.01.02.07.53.22; Wed, 02 Jan 2019 07:53:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E5HYm087; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730288AbfABPxV (ORCPT + 31 others); Wed, 2 Jan 2019 10:53:21 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:41694 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730274AbfABPxU (ORCPT ); Wed, 2 Jan 2019 10:53:20 -0500 Received: by mail-pl1-f193.google.com with SMTP id u6so14661817plm.8 for ; Wed, 02 Jan 2019 07:53:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=O3oktLmRrcQkvmGvrxjx/dlqIUCFKJqlZmJSB7MMuho=; b=E5HYm0870CVQ2Sz23+5HgLFQL03S7BaU2DchIc3AZWi8MWElfbNhLyliMCVlK7U0Im GaByMtoisgQcpMUXeFLwLb5f9Ph5MM2tZMbmqPschfougJH5OP2WokaS97w1wfyY0MLS 1w/sdhNTD0u9Vk24cdn+tj9FWUqmPhvI2G4Ls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O3oktLmRrcQkvmGvrxjx/dlqIUCFKJqlZmJSB7MMuho=; b=sNgimweMmNh4ObDW2fo9vQVLNEye1/m1s1H9bLZqf65bxEWytCpjx6OYZd2oRWdxab lZyjVzb/cy15fl0o/VoD2ml44Pkbp1QsDlzOBqCLhMi07ZMgtfoNlM7dPxT4JUgzXIEh sUKoojixL7A+I7HKHymo/qMcMN6mKAV0gvhrMtAMHk73OpVKlZj0DYiuMnSkFSDhL0d+ n/bf4OAjwCM3HM7B9nIGoG2YFaW5U0ExRmwaxlAIKnJBrVPs11AM8RC5KbDuZWAZfFu3 ahQehv3Fj0VrR2ktrLrm7H+UZYA53gdUOp8lIKGRRPFov/CITFFBCcS35lY6OQMYB2Km iESw== X-Gm-Message-State: AJcUukdIVSh2jIaZvEvIXyiEmui28AZhWlHq/fJjT1NAa/dD4MgZFvj1 wGUvxnokEEfkCnBQ70ekZYY6eg== X-Received: by 2002:a17:902:722:: with SMTP id 31mr44165479pli.271.1546444399500; Wed, 02 Jan 2019 07:53:19 -0800 (PST) Received: from qualcomm-HP-ZBook-14-G2.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id n7sm95242637pff.36.2019.01.02.07.53.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Jan 2019 07:53:19 -0800 (PST) From: Firoz Khan To: "David S . Miller" , Al Viro , sparclinux@vger.kernel.org, Greg Kroah-Hartman , Philippe Ombredanne , Thomas Gleixner , Kate Stewart Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, arnd@arndb.de, deepa.kernel@gmail.com, marcin.juszkiewicz@linaro.org, firoz.khan@linaro.org Subject: [PATCH 1/3] sparc: remove nargs from __SYSCALL Date: Wed, 2 Jan 2019 21:22:51 +0530 Message-Id: <1546444373-21386-2-git-send-email-firoz.khan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546444373-21386-1-git-send-email-firoz.khan@linaro.org> References: <1546444373-21386-1-git-send-email-firoz.khan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The __SYSCALL macro's arguments are system call number, system call entry name and number of arguments for the system call. Argument- nargs in __SYSCALL(nr, entry, nargs) is neither calculated nor used anywhere. So it would be better to keep the implementaion as __SYSCALL(nr, entry). This will unifies the implementation with some other architetures too. Signed-off-by: Firoz Khan --- arch/sparc/kernel/syscalls/syscalltbl.sh | 4 ++-- arch/sparc/kernel/systbls_32.S | 2 +- arch/sparc/kernel/systbls_64.S | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/arch/sparc/kernel/syscalls/syscalltbl.sh b/arch/sparc/kernel/syscalls/syscalltbl.sh index 77cf014..ffe954b 100644 --- a/arch/sparc/kernel/syscalls/syscalltbl.sh +++ b/arch/sparc/kernel/syscalls/syscalltbl.sh @@ -13,10 +13,10 @@ emit() { t_entry="$3" while [ $t_nxt -lt $t_nr ]; do - printf "__SYSCALL(%s, sys_nis_syscall, )\n" "${t_nxt}" + printf "__SYSCALL(%s,sys_nis_syscall)\n" "${t_nxt}" t_nxt=$((t_nxt+1)) done - printf "__SYSCALL(%s, %s, )\n" "${t_nxt}" "${t_entry}" + printf "__SYSCALL(%s,%s)\n" "${t_nxt}" "${t_entry}" } grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | ( diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S index ab9e4d5..391a49a 100644 --- a/arch/sparc/kernel/systbls_32.S +++ b/arch/sparc/kernel/systbls_32.S @@ -9,7 +9,7 @@ * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) */ -#define __SYSCALL(nr, entry, nargs) .long entry +#define __SYSCALL(nr, entry) .long entry .data .align 4 .globl sys_call_table diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S index a27394b..08ce7cb 100644 --- a/arch/sparc/kernel/systbls_64.S +++ b/arch/sparc/kernel/systbls_64.S @@ -10,7 +10,7 @@ * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) */ -#define __SYSCALL(nr, entry, nargs) .word entry +#define __SYSCALL(nr, entry) .word entry .text .align 4 #ifdef CONFIG_COMPAT From patchwork Wed Jan 2 15:52:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Firoz Khan X-Patchwork-Id: 154673 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp313171ljp; Wed, 2 Jan 2019 07:53:29 -0800 (PST) X-Google-Smtp-Source: AFSGD/WG5cJPbEmZSvt2J2jIGyy2ulvJTg/5xK3Ol7NZoP1WviPMZ0LL5rOBD1dtQ91z7ya/cUSQ X-Received: by 2002:a62:220d:: with SMTP id i13mr44629554pfi.162.1546444409070; Wed, 02 Jan 2019 07:53:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546444409; cv=none; d=google.com; s=arc-20160816; b=e40QE30unQoXPwuYuNB5aDm9bJVZZc0t3gs0FscvK3AsHJTU2D4AqpkY7kS9YGUERY 69maY6IMzmbSAoi6UdKIzj8m9k15EbWyjaR/RzFSzoi599/5dtIvIWqWRjHcrt9kgkGn 6WP8vKdhtZ4XZqUSFS8alN1g0k3mhZUXIAkabMcDoDAdiyc6hb/grVpdYazQQQG3FuJh va9AYC6KMq1lHhLTRLIakpIuJdOlXlPtIDMPetHpaxmuW9GtO9A1uiXPkWQjsInnZU0X PoDETjwgRPJiJyqMSI+Ru7cwtd9u2d/fRbR1nNxSKRun7FUtRIj4hcevZ6Ysyon2C6ZQ QW9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=xxQH5NeQq6MvU16ENPdcrPrwdvwf7ju4FD0coaVYm/I=; b=cVN6iKAgD1YKyS3nTmqTtNQ1QjbGE6wBAY436YxmpgUHpzZ9RCxvk0vUljTYZMz5b3 q4i4nVjOnGwaWmcEo+Vfrn3GuGXl/qWqHSRFBX7S4eKbq6lex5RqsUjf89/PmmySDRYm oHDAx/rm0s2t2FolnU9GGihuW1yecdUFIDDjC0d4l1NqJnr3VGDzbHXDOD/d9SgyHBHs g/ae1TwbvKDx/iPLr0A4CgPiLT9FFMwgnhxG3kb4597l1OdpOuPMG8OGgkvaDDXtspZN saPgR0kO9yIKq29RzT6mdvehupavSSAKnJ1ZwwVrhT3DQ7MQFDkFNAYJZ+cCIqdCAz4i TMvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hXcqIW/P"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p23si8863729pgk.312.2019.01.02.07.53.28; Wed, 02 Jan 2019 07:53:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hXcqIW/P"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730300AbfABPx1 (ORCPT + 31 others); Wed, 2 Jan 2019 10:53:27 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:34783 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729698AbfABPxZ (ORCPT ); Wed, 2 Jan 2019 10:53:25 -0500 Received: by mail-pf1-f196.google.com with SMTP id h3so15356843pfg.1 for ; Wed, 02 Jan 2019 07:53:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xxQH5NeQq6MvU16ENPdcrPrwdvwf7ju4FD0coaVYm/I=; b=hXcqIW/PZNiqYsvCnr2c+6F5zlRLQNgQZwRusjZMocjFC10pdMarvYa10OruYq5Trk Y8J1GR15GUtfwpybCrKiGiCi1gz5CDgxBCkbNT1TSy2x/osMg71HagVjGKPSa/vwdpAJ nBj+QczX1C+0XHhmykqt0nQphmTARc9Sl0o5Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xxQH5NeQq6MvU16ENPdcrPrwdvwf7ju4FD0coaVYm/I=; b=LnmvlC5Vr910ko6GWrGjdTN2IF0Y2QKsNeAKbZknmRadlG3ELGKS6wGQsDfTebPt02 kaRgrA8AgKpLz8CU8F2toUz+JMJ8qiCJN5CLR5fJwoLF0eqQerSzsFNjGVV03iDmxqdH p9U/MJbbJHDBtG0e2BQgWcZMLdVMbtBRHdIGu3a15n5AW05C/3563SGXxzf8UsQCDIp/ 5a3FCUmDtRMSKx8+Rt3pGVIJCOVsX6omhe5oxwLM7zEkNiJzY6jqpnUr8bhtsRXJ/u5v EvjnCw/Mv/8x7G8pCErKnxPKIJw+hftYfa4hu3cRBavzIHTF08jhJQK3cbCE9K9a9qv3 GgLQ== X-Gm-Message-State: AA+aEWZQc3ouDLQREWT60NBIL2T++4BIsORIzKWwtk3bG0PYaPFJ7za/ ClTdEop9xWuY+9n5i+Byr+dh1Q== X-Received: by 2002:a62:4886:: with SMTP id q6mr46198734pfi.182.1546444404102; Wed, 02 Jan 2019 07:53:24 -0800 (PST) Received: from qualcomm-HP-ZBook-14-G2.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id n7sm95242637pff.36.2019.01.02.07.53.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Jan 2019 07:53:23 -0800 (PST) From: Firoz Khan To: "David S . Miller" , Al Viro , sparclinux@vger.kernel.org, Greg Kroah-Hartman , Philippe Ombredanne , Thomas Gleixner , Kate Stewart Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, arnd@arndb.de, deepa.kernel@gmail.com, marcin.juszkiewicz@linaro.org, firoz.khan@linaro.org Subject: [PATCH 2/3] sparc: rename not implemented system call Date: Wed, 2 Jan 2019 21:22:52 +0530 Message-Id: <1546444373-21386-3-git-send-email-firoz.khan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546444373-21386-1-git-send-email-firoz.khan@linaro.org> References: <1546444373-21386-1-git-send-email-firoz.khan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename the sparc not implemented system call - sys_nis_syscall to sys_ni_syscall to unify the system call table implementation across all architectures. This is neccessory to do it if we have to keep the scripts in common location. Signed-off-by: Firoz Khan --- arch/sparc/kernel/syscalls/syscall.tbl | 26 +++++++++++++------------- arch/sparc/kernel/systbls_32.S | 1 + arch/sparc/kernel/systbls_64.S | 2 ++ 3 files changed, 16 insertions(+), 13 deletions(-) -- 1.9.1 diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl index c8c77c0..5437fdb 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl @@ -20,7 +20,7 @@ 9 common link sys_link 10 common unlink sys_unlink 11 32 execv sunos_execv -11 64 execv sys_nis_syscall +11 64 execv sys_ni_syscall 12 common chdir sys_chdir 13 32 chown sys_chown16 13 64 chown sys_chown @@ -29,7 +29,7 @@ 16 32 lchown sys_lchown16 16 64 lchown sys_lchown 17 common brk sys_brk -18 common perfctr sys_nis_syscall +18 common perfctr sys_ni_syscall 19 common lseek sys_lseek compat_sys_lseek 20 common getpid sys_getpid 21 common capget sys_capget @@ -43,7 +43,7 @@ 27 common alarm sys_alarm 28 common sigaltstack sys_sigaltstack compat_sys_sigaltstack 29 32 pause sys_pause -29 64 pause sys_nis_syscall +29 64 pause sys_ni_syscall 30 common utime sys_utime compat_sys_utime 31 32 lchown32 sys_lchown 32 32 fchown32 sys_fchown @@ -214,7 +214,7 @@ 181 common removexattr sys_removexattr 182 common lremovexattr sys_lremovexattr 183 32 sigpending sys_sigpending compat_sys_sigpending -183 64 sigpending sys_nis_syscall +183 64 sigpending sys_ni_syscall 184 common query_module sys_ni_syscall 185 common setpgid sys_setpgid 186 common fremovexattr sys_fremovexattr @@ -233,15 +233,15 @@ 196 common ioprio_set sys_ioprio_set 197 common getppid sys_getppid 198 32 sigaction sys_sparc_sigaction compat_sys_sparc_sigaction -198 64 sigaction sys_nis_syscall +198 64 sigaction sys_ni_syscall 199 common sgetmask sys_sgetmask 200 common ssetmask sys_ssetmask 201 32 sigsuspend sys_sigsuspend -201 64 sigsuspend sys_nis_syscall +201 64 sigsuspend sys_ni_syscall 202 common oldlstat sys_newlstat compat_sys_newlstat 203 common uselib sys_uselib 204 32 readdir sys_old_readdir compat_sys_old_readdir -204 64 readdir sys_nis_syscall +204 64 readdir sys_ni_syscall 205 common readahead sys_readahead compat_sys_readahead 206 common socketcall sys_socketcall sys32_socketcall 207 common syslog sys_syslog @@ -255,19 +255,19 @@ 215 32 ipc sys_ipc compat_sys_ipc 215 64 ipc sys_sparc_ipc 216 32 sigreturn sys_sigreturn sys32_sigreturn -216 64 sigreturn sys_nis_syscall +216 64 sigreturn sys_ni_syscall 217 common clone sys_clone 218 common ioprio_get sys_ioprio_get 219 common adjtimex sys_adjtimex compat_sys_adjtimex 220 32 sigprocmask sys_sigprocmask compat_sys_sigprocmask -220 64 sigprocmask sys_nis_syscall +220 64 sigprocmask sys_ni_syscall 221 common create_module sys_ni_syscall 222 common delete_module sys_delete_module 223 common get_kernel_syms sys_ni_syscall 224 common getpgid sys_getpgid 225 common bdflush sys_bdflush 226 common sysfs sys_sysfs -227 common afs_syscall sys_nis_syscall +227 common afs_syscall sys_ni_syscall 228 common setfsuid sys_setfsuid16 229 common setfsgid sys_setfsgid16 230 common _newselect sys_select compat_sys_select @@ -295,8 +295,8 @@ 251 common _sysctl sys_sysctl compat_sys_sysctl 252 common getsid sys_getsid 253 common fdatasync sys_fdatasync -254 32 nfsservctl sys_ni_syscall sys_nis_syscall -254 64 nfsservctl sys_nis_syscall +254 32 nfsservctl sys_ni_syscall sys_ni_syscall +254 64 nfsservctl sys_ni_syscall 255 common sync_file_range sys_sync_file_range compat_sys_sync_file_range 256 common clock_settime sys_clock_settime compat_sys_clock_settime 257 common clock_gettime sys_clock_gettime compat_sys_clock_gettime @@ -310,7 +310,7 @@ 265 common timer_delete sys_timer_delete 266 common timer_create sys_timer_create compat_sys_timer_create # 267 was vserver -267 common vserver sys_nis_syscall +267 common vserver sys_ni_syscall 268 common io_setup sys_io_setup compat_sys_io_setup 269 common io_destroy sys_io_destroy 270 common io_submit sys_io_submit compat_sys_io_submit diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S index 391a49a..121a1a0 100644 --- a/arch/sparc/kernel/systbls_32.S +++ b/arch/sparc/kernel/systbls_32.S @@ -14,5 +14,6 @@ .align 4 .globl sys_call_table sys_call_table: +#define sys_nis_syscall sys_ni_syscall #include /* 32-bit native syscalls */ #undef __SYSCALL diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S index 08ce7cb..7d861d6 100644 --- a/arch/sparc/kernel/systbls_64.S +++ b/arch/sparc/kernel/systbls_64.S @@ -10,6 +10,8 @@ * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu) */ +#define sys_nis_syscall sys_ni_syscall + #define __SYSCALL(nr, entry) .word entry .text .align 4 From patchwork Wed Jan 2 15:52:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Firoz Khan X-Patchwork-Id: 154674 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp313230ljp; Wed, 2 Jan 2019 07:53:32 -0800 (PST) X-Google-Smtp-Source: ALg8bN6jnc9+u/QoT4lIPZE0lidw7p0f8h+ecxeAKyOjbakB6O8XG5oo/9v+eTj7IfZ1v/F67fN8 X-Received: by 2002:a63:2406:: with SMTP id k6mr13495250pgk.229.1546444412715; Wed, 02 Jan 2019 07:53:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546444412; cv=none; d=google.com; s=arc-20160816; b=Rfgxd5n6ryJorktHTKW4Z9nCYKoimCPCCuv+go7ghfv/Mhedu78ADfxSQRczfNHzIV ZNEgjl7zmgC5llNlkm3GqOC433SiKF4++EqP0pvym/s1c3Rypk28U3RF9mWE7UT/rr97 tdMcX/HeP6FiNDYxyoIsut85B0ektYl1JXmJ/0LQ3d6FhHvBuFTZpNorFHgSRGVu8aeR zi6goztGmizsmuPlvW09vWpVSkxczIIFgmK2uNu4pDj9cjpEENTcBWL8mXP4B+HJB0ND T8t+nGTqKA+LuFLFXBuxIa8EQL8kmdQgfsMN9zMsDn9ev5+bWewaIjh1qLNCkPXr00Tz 6vYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=/6QIRkSywJIAMa7P20oR43mtkBtoVMs6c6JfHglievg=; b=W3EsSFUBOh2o213Qma92QJPjaUIwnGoR5FWPzJfNk4lQPI0rL78dGW9vVSSXoQXqwC HKOjiBCnu8I+jvyWMqUKo/Aa+vFqWws+wy8fQutzgSH7RgE6dzA2O+Mp8qyv/7k9O6YS HDFq/02ucGIwhLoL6CzW06iuXI7gMBfCW794fk/PT7poxGHsShpczPQ7Z/Vkws2pEG66 ZC78DQG7GCwGd/6igcG217QRLBLx7N4Tgu69o6/OoY/WCdUgTRwa4gZpPwwrJHna71o8 ICJKWUVWhDtIesbCxHG6r1xdn+h0KOc+m/ODKGMBCjW/xhY4JSvKmDRKY2K8Lz7oTFug 1hKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UvBut2rs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p23si8863729pgk.312.2019.01.02.07.53.32; Wed, 02 Jan 2019 07:53:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UvBut2rs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730317AbfABPxb (ORCPT + 31 others); Wed, 2 Jan 2019 10:53:31 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34786 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730301AbfABPx3 (ORCPT ); Wed, 2 Jan 2019 10:53:29 -0500 Received: by mail-pf1-f193.google.com with SMTP id h3so15356929pfg.1 for ; Wed, 02 Jan 2019 07:53:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/6QIRkSywJIAMa7P20oR43mtkBtoVMs6c6JfHglievg=; b=UvBut2rsd5wSSYOe0iapCEq1qfsXDQFns6i8u9tKA2rggBxhyfrXM8m4l3d2ZEDpa9 gypCnTqf08i9JwLUoBDx3zlmV77nxJ7KR9bjyRCycudqeda7Fqp4hqbavk3TOvDZRJuY dnoRQpsnQoPxurB8+XcinSUd5VYILZFFkAUCI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/6QIRkSywJIAMa7P20oR43mtkBtoVMs6c6JfHglievg=; b=Qkt449Re7THk53qYX8AB83LuYX8dDeHcRH+yMTLmtRWaXeq/dLtGkLjjvR9KY6aqIc tz6zp4HOTFTzkAQZPC0HaHti0f61efFea5o2h9X6aQ6agBOeEZpocj91Zygo9WB/mCAt 8sEH9qJY4Za9pMC1Ep/OaCVA3sVBzFE0Kqeb3POppN76Yi6Clsx5/yVAcxXhr5S0seGe 41a3vplGUu8EOuzUZu3DiXMQNES91FTxOjPGVrD9HIpYdWF8CC+MBXf1kngliw48Opaf uNVY0mK2c/SbWiwjoDHuch7lJ7iR3bl7FppAYxrlsxMZwx9IX5+AMqXPTaPf3lSaWYzj MfmA== X-Gm-Message-State: AJcUuke/HFibELuC4d6ZMj7VZYHcNJ2eACINBhUd2RzmW89LdCK7uFaN kMk1Cv+5JA+TMDAj9CaX06WOgvLixPk= X-Received: by 2002:a62:8d4f:: with SMTP id z76mr46207397pfd.2.1546444408523; Wed, 02 Jan 2019 07:53:28 -0800 (PST) Received: from qualcomm-HP-ZBook-14-G2.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id n7sm95242637pff.36.2019.01.02.07.53.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Jan 2019 07:53:28 -0800 (PST) From: Firoz Khan To: "David S . Miller" , Al Viro , sparclinux@vger.kernel.org, Greg Kroah-Hartman , Philippe Ombredanne , Thomas Gleixner , Kate Stewart Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, arnd@arndb.de, deepa.kernel@gmail.com, marcin.juszkiewicz@linaro.org, firoz.khan@linaro.org Subject: [PATCH 3/3] sparc: generate uapi header and system call table files Date: Wed, 2 Jan 2019 21:22:53 +0530 Message-Id: <1546444373-21386-4-git-send-email-firoz.khan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546444373-21386-1-git-send-email-firoz.khan@linaro.org> References: <1546444373-21386-1-git-send-email-firoz.khan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Unified system call table generation script must be run to generate unistd_32/64.h and syscall_table_32/64/c32.h files. This patch will have changes which will invokes the script. This patch will generate unistd_32/64.h and syscall_table- _32/64/c32.h files by the syscall table generation script invoked by parisc/Makefile and the generated files against the removed files must be identical. The generated uapi header file will be included in uapi/- asm/unistd.h and generated system call table header file will be included by kernel/systbls_32/64.S file. Signed-off-by: Firoz Khan --- arch/sparc/kernel/syscalls/Makefile | 11 ++++++++-- arch/sparc/kernel/syscalls/syscallhdr.sh | 36 -------------------------------- arch/sparc/kernel/syscalls/syscalltbl.sh | 36 -------------------------------- 3 files changed, 9 insertions(+), 74 deletions(-) delete mode 100644 arch/sparc/kernel/syscalls/syscallhdr.sh delete mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh -- 1.9.1 diff --git a/arch/sparc/kernel/syscalls/Makefile b/arch/sparc/kernel/syscalls/Makefile index c22a21c..e24272d 100644 --- a/arch/sparc/kernel/syscalls/Makefile +++ b/arch/sparc/kernel/syscalls/Makefile @@ -6,8 +6,9 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') syscall := $(srctree)/$(src)/syscall.tbl -syshdr := $(srctree)/$(src)/syscallhdr.sh -systbl := $(srctree)/$(src)/syscalltbl.sh +syshdr := $(srctree)/scripts/syscallhdr.sh +sysnr := $(srctree)/scripts/syscallnr.sh +systbl := $(srctree)/scripts/syscalltbl.sh quiet_cmd_syshdr = SYSHDR $@ cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \ @@ -15,6 +16,12 @@ quiet_cmd_syshdr = SYSHDR $@ '$(syshdr_pfx_$(basetarget))' \ '$(syshdr_offset_$(basetarget))' +quiet_cmd_sysnr = SYSNR $@ + cmd_sysnr = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \ + '$(sysnr_abis_$(basetarget))' \ + '$(sysnr_pfx_$(basetarget))' \ + '$(sysnr_offset_$(basetarget))' + quiet_cmd_systbl = SYSTBL $@ cmd_systbl = $(CONFIG_SHELL) '$(systbl)' '$<' '$@' \ '$(systbl_abis_$(basetarget))' \ diff --git a/arch/sparc/kernel/syscalls/syscallhdr.sh b/arch/sparc/kernel/syscalls/syscallhdr.sh deleted file mode 100644 index 626b574..0000000 --- a/arch/sparc/kernel/syscalls/syscallhdr.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -in="$1" -out="$2" -my_abis=`echo "($3)" | tr ',' '|'` -prefix="$4" -offset="$5" - -fileguard=_UAPI_ASM_SPARC_`basename "$out" | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ - -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'` -grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | ( - printf "#ifndef %s\n" "${fileguard}" - printf "#define %s\n" "${fileguard}" - printf "\n" - - nxt=0 - while read nr abi name entry compat ; do - if [ -z "$offset" ]; then - printf "#define __NR_%s%s\t%s\n" \ - "${prefix}" "${name}" "${nr}" - else - printf "#define __NR_%s%s\t(%s + %s)\n" \ - "${prefix}" "${name}" "${offset}" "${nr}" - fi - nxt=$((nr+1)) - done - - printf "\n" - printf "#ifdef __KERNEL__\n" - printf "#define __NR_syscalls\t%s\n" "${nxt}" - printf "#endif\n" - printf "\n" - printf "#endif /* %s */" "${fileguard}" -) > "$out" diff --git a/arch/sparc/kernel/syscalls/syscalltbl.sh b/arch/sparc/kernel/syscalls/syscalltbl.sh deleted file mode 100644 index ffe954b..0000000 --- a/arch/sparc/kernel/syscalls/syscalltbl.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -in="$1" -out="$2" -my_abis=`echo "($3)" | tr ',' '|'` -my_abi="$4" -offset="$5" - -emit() { - t_nxt="$1" - t_nr="$2" - t_entry="$3" - - while [ $t_nxt -lt $t_nr ]; do - printf "__SYSCALL(%s,sys_nis_syscall)\n" "${t_nxt}" - t_nxt=$((t_nxt+1)) - done - printf "__SYSCALL(%s,%s)\n" "${t_nxt}" "${t_entry}" -} - -grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | ( - nxt=0 - if [ -z "$offset" ]; then - offset=0 - fi - - while read nr abi name entry compat ; do - if [ "$my_abi" = "c32" ] && [ ! -z "$compat" ]; then - emit $((nxt+offset)) $((nr+offset)) $compat - else - emit $((nxt+offset)) $((nr+offset)) $entry - fi - nxt=$((nr+1)) - done -) > "$out"