On Mon, Mar 1, 2021 at 11:20 PM Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote:
>
> Many architectures duplicate similar shell scripts.
>
> This commit converts ia64 to use scripts/syscalltbl.sh.
>
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> ---
Applied to linux-kbuild.
>
> arch/ia64/kernel/entry.S | 3 +--
> arch/ia64/kernel/syscalls/Makefile | 8 ++-----
> arch/ia64/kernel/syscalls/syscalltbl.sh | 32 -------------------------
> 3 files changed, 3 insertions(+), 40 deletions(-)
> delete mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh
>
> diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
> index e98e3dafffd8..5eba3fb2e311 100644
> --- a/arch/ia64/kernel/entry.S
> +++ b/arch/ia64/kernel/entry.S
> @@ -1420,10 +1420,9 @@ END(ftrace_stub)
>
> #endif /* CONFIG_FUNCTION_TRACER */
>
> -#define __SYSCALL(nr, entry, nargs) data8 entry
> +#define __SYSCALL(nr, entry) data8 entry
> .rodata
> .align 8
> .globl sys_call_table
> sys_call_table:
> #include <asm/syscall_table.h>
> -#undef __SYSCALL
> diff --git a/arch/ia64/kernel/syscalls/Makefile b/arch/ia64/kernel/syscalls/Makefile
> index bf4bda0f63eb..2d2e420749b0 100644
> --- a/arch/ia64/kernel/syscalls/Makefile
> +++ b/arch/ia64/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,16 +16,12 @@ 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) $< $@
>
> syshdr_offset_unistd_64 := __NR_Linux
> $(uapi)/unistd_64.h: $(syscall) $(syshdr) FORCE
> $(call if_changed,syshdr)
>
> -systbl_offset_syscall_table := 1024
> $(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE
> $(call if_changed,systbl)
>
> diff --git a/arch/ia64/kernel/syscalls/syscalltbl.sh b/arch/ia64/kernel/syscalls/syscalltbl.sh
> deleted file mode 100644
> index 85d78d9309ad..000000000000
> --- a/arch/ia64/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"
> --
> 2.27.0
>
--
Best Regards
Masahiro Yamada
