From patchwork Fri May 28 04:00:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12286155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 967DEC47087 for ; Fri, 28 May 2021 04:02:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A41E613DA for ; Fri, 28 May 2021 04:02:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A41E613DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Oz7wsuuqbiWJxhzWQojarpQATMHf0dQ3r8BDV33DZbc=; b=RgMecs5jdWyXXQ PX/A74gbVlFVSGlDxRcwst6QOotXVM1LFvs5JPF7xVzNCDBqeMwXR1c/WQ8nMxE1MndC/xX0fGiaW WMuTlSnS/Nmh9pERtrAexOJ5/G9s3Grd63WJ/mnX9bv2HDvKh/EykLG2Grk+U+WnRZNzc0CJh0czm rV7wjVU0OHc+OS59WmNure0lRoO2KNnRUOo9v0zW901V0UM+ndqjvI1Cea5hGFBGkGeysK/pzcpiE w6iv0JnMDFJ49P8rugd/qFrQhGBdFzBNN3ESKdT4y2tRLUjZZGladaXFW16kH4ERB3rG1gs/KP4G3 JB/gTIe1FMFkXkSEYlvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmTgE-00BkgB-3M; Fri, 28 May 2021 04:01:06 +0000 Received: from conuserg-10.nifty.com ([210.131.2.77]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmTg9-00Bkec-SA for linux-arm-kernel@lists.infradead.org; Fri, 28 May 2021 04:00:59 +0000 Received: from localhost.localdomain (133-32-232-101.west.xps.vectant.ne.jp [133.32.232.101]) (authenticated) by conuserg-10.nifty.com with ESMTP id 14S40IVA023787; Fri, 28 May 2021 13:00:18 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com 14S40IVA023787 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1622174418; bh=kXCWf9JfpTorquIMy+GqkIRC1TM6xcAKHYrkf4dDilI=; h=From:To:Cc:Subject:Date:From; b=WFEdhJhkpJP4OOdFBlvkJxZ5BNjVlcTAwzLPDyR7yQE2Yotw0zWLBsELp26lch9Qf D7EsmBzyiILwUFta8lN37Gd9eUdcjkX42RkrOkg5Say98VyO11z+PTIuKhFxiT6ufE Rssj6Bb43m1w0S9Zh39SvjRZlCtqKfNaHtvuh9kJ20vsCK8SAbTh1XeI2fG2p7Sj6A xHfdWmDB9cxQb/Wany72XlxxQt8qSuJ+/23Y0PFrIgM2CCT1cy2AEZlNykF4ZhgFqV hqf3XXBojz0gyVo9LBfSkamSBqNdADZMAVJfrFgKXeX/dhO//149IOkmoqhvHI0W6m XUAONZWaJkUnw== X-Nifty-SrcIP: [133.32.232.101] From: Masahiro Yamada To: patches@arm.linux.org.uk Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Linus Walleij , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: remove unneeded abi parameter to syscallnr.sh Date: Fri, 28 May 2021 13:00:14 +0900 Message-Id: <20210528040014.2160181-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210527_210058_148834_976BE9BE X-CRM114-Status: UNSURE ( 9.87 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org You do not need to pass the abi parameter to syscallnr.sh because it parses all the lines of syscall.tbl except comments anyway. Simplify the code. Also, remove unneeded single-quoting. Signed-off-by: Masahiro Yamada Reviewed-by: Linus Walleij --- KernelVersion: v5.13-rc1 arch/arm/tools/Makefile | 4 +--- arch/arm/tools/syscallnr.sh | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile index 057639019059..3f254456a830 100644 --- a/arch/arm/tools/Makefile +++ b/arch/arm/tools/Makefile @@ -46,8 +46,7 @@ quiet_cmd_systbl = SYSTBL $@ cmd_systbl = $(CONFIG_SHELL) $(systbl) --abis $(abis) $< $@ quiet_cmd_sysnr = SYSNR $@ - cmd_sysnr = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \ - '$(syshdr_abi_$(basetarget))' + cmd_sysnr = $(CONFIG_SHELL) $(sysnr) $< $@ $(uapi)/unistd-oabi.h: abis := common,oabi $(uapi)/unistd-oabi.h: $(syscall) $(syshdr) FORCE @@ -57,7 +56,6 @@ $(uapi)/unistd-eabi.h: abis := common,eabi $(uapi)/unistd-eabi.h: $(syscall) $(syshdr) FORCE $(call if_changed,syshdr) -sysnr_abi_unistd-nr := common,oabi,eabi,compat $(kapi)/unistd-nr.h: $(syscall) $(sysnr) FORCE $(call if_changed,sysnr) diff --git a/arch/arm/tools/syscallnr.sh b/arch/arm/tools/syscallnr.sh index df3ccd0ca831..9e386770b6b3 100644 --- a/arch/arm/tools/syscallnr.sh +++ b/arch/arm/tools/syscallnr.sh @@ -2,14 +2,13 @@ # SPDX-License-Identifier: GPL-2.0 in="$1" out="$2" -my_abis=`echo "($3)" | tr ',' '|'` align=1 fileguard=_ASM_ARM_`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 | tail -n1 | ( +grep -E "^[0-9A-Fa-fXx]+[[:space:]]+" "$in" | sort -n | tail -n1 | ( echo "#ifndef ${fileguard} #define ${fileguard} 1