Messages in this thread | | | Subject | Re: [PATCH 1/2] microblaze: syscalls: switch to generic syscalltbl.sh | From | Michal Simek <> | Date | Tue, 2 Mar 2021 14:00:39 +0100 |
| |
On 3/1/21 3:23 PM, Masahiro Yamada wrote: > Many architectures duplicate similar shell scripts. > > This commit converts microblaze to use scripts/syscalltbl.sh. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/microblaze/kernel/syscall_table.S | 3 +- > arch/microblaze/kernel/syscalls/Makefile | 7 ++-- > arch/microblaze/kernel/syscalls/syscalltbl.sh | 32 ------------------- > 3 files changed, 3 insertions(+), 39 deletions(-) > delete mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh > > diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S > index ce006646f741..3bc60a2b159e 100644 > --- a/arch/microblaze/kernel/syscall_table.S > +++ b/arch/microblaze/kernel/syscall_table.S > @@ -1,6 +1,5 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > > -#define __SYSCALL(nr, entry, nargs) .long entry > +#define __SYSCALL(nr, entry) .long entry > ENTRY(sys_call_table) > #include <asm/syscall_table.h> > -#undef __SYSCALL > diff --git a/arch/microblaze/kernel/syscalls/Makefile b/arch/microblaze/kernel/syscalls/Makefile > index 285aaba832d9..ad2492cb5568 100644 > --- a/arch/microblaze/kernel/syscalls/Makefile > +++ b/arch/microblaze/kernel/syscalls/Makefile > @@ -7,7 +7,7 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ > > syscall := $(src)/syscall.tbl > syshdr := $(srctree)/$(src)/syscallhdr.sh > -systbl := $(srctree)/$(src)/syscalltbl.sh > +systbl := $(srctree)/scripts/syscalltbl.sh > > quiet_cmd_syshdr = SYSHDR $@ > cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \ > @@ -16,10 +16,7 @@ quiet_cmd_syshdr = SYSHDR $@ > '$(syshdr_offset_$(basetarget))' > > quiet_cmd_systbl = SYSTBL $@ > - cmd_systbl = $(CONFIG_SHELL) '$(systbl)' '$<' '$@' \ > - '$(systbl_abis_$(basetarget))' \ > - '$(systbl_abi_$(basetarget))' \ > - '$(systbl_offset_$(basetarget))' > + cmd_systbl = $(CONFIG_SHELL) $(systbl) $< $@ > > $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE > $(call if_changed,syshdr) > diff --git a/arch/microblaze/kernel/syscalls/syscalltbl.sh b/arch/microblaze/kernel/syscalls/syscalltbl.sh > deleted file mode 100644 > index 85d78d9309ad..000000000000 > --- a/arch/microblaze/kernel/syscalls/syscalltbl.sh > +++ /dev/null > @@ -1,32 +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_ni_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 ; do > - emit $((nxt+offset)) $((nr+offset)) $entry > - nxt=$((nr+1)) > - done > -) > "$out" >
Applied both. M
-- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
| |