* [PATCH] ARM: remove unneeded abi parameter to syscallnr.sh
@ 2021-05-28 4:00 Masahiro Yamada
2021-05-28 8:26 ` Linus Walleij
0 siblings, 1 reply; 2+ messages in thread
From: Masahiro Yamada @ 2021-05-28 4:00 UTC (permalink / raw)
To: patches
Cc: linux-kernel, Masahiro Yamada, Linus Walleij, Russell King,
linux-arm-kernel
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 <masahiroy@kernel.org>
---
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
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: remove unneeded abi parameter to syscallnr.sh
2021-05-28 4:00 [PATCH] ARM: remove unneeded abi parameter to syscallnr.sh Masahiro Yamada
@ 2021-05-28 8:26 ` Linus Walleij
0 siblings, 0 replies; 2+ messages in thread
From: Linus Walleij @ 2021-05-28 8:26 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: patches, linux-kernel, Russell King, Linux ARM
On Fri, May 28, 2021 at 6:00 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
> 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 <masahiroy@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-28 8:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-28 4:00 [PATCH] ARM: remove unneeded abi parameter to syscallnr.sh Masahiro Yamada
2021-05-28 8:26 ` Linus Walleij
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).