From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-ia64@vger.kernel.org
Cc: Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Christian Brauner <christian.brauner@ubuntu.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Mike Rapoport <rppt@kernel.org>
Subject: Re: [PATCH 1/2] ia64: syscalls: switch to generic syscalltbl.sh
Date: Sun, 11 Apr 2021 22:50:35 +0900 [thread overview]
Message-ID: <CAK7LNARzOvCr4-+r-MMZ_zdaSR3JUVU=wmuKj4HQPwQDej=vHg@mail.gmail.com> (raw)
In-Reply-To: <20210301141937.342604-1-masahiroy@kernel.org>
On Mon, Mar 1, 2021 at 11:20 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Many architectures duplicate similar shell scripts.
>
> This commit converts ia64 to use scripts/syscalltbl.sh.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
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
prev parent reply other threads:[~2021-04-11 13:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 14:19 [PATCH 1/2] ia64: syscalls: switch to generic syscalltbl.sh Masahiro Yamada
2021-03-01 14:19 ` [PATCH 2/2] ia64: syscalls: switch to generic syscallhdr.sh Masahiro Yamada
2021-04-11 13:50 ` Masahiro Yamada [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAK7LNARzOvCr4-+r-MMZ_zdaSR3JUVU=wmuKj4HQPwQDej=vHg@mail.gmail.com' \
--to=masahiroy@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=christian.brauner@ubuntu.com \
--cc=geert@linux-m68k.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rppt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).