Commit daf26180 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Max Filippov
Browse files

xtensa: syscalls: switch to generic syscalltbl.sh 



Many architectures duplicate similar shell scripts.

This commit converts xtensa to use scripts/syscalltbl.sh.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Message-Id: <20210301153656.363839-2-masahiroy@kernel.org>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 8d949ae2

arch/xtensa/kernel/syscall.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -28,9 +28,8 @@ 
#include <linux/shm.h>

#include <linux/shm.h>





syscall_t sys_call_table[] /* FIXME __cacheline_aligned */= {

syscall_t sys_call_table[] /* FIXME __cacheline_aligned */= {

#define __SYSCALL(nr, entry, nargs)	(syscall_t)entry,

#define __SYSCALL(nr, entry)	(syscall_t)entry,

#include <asm/syscall_table.h>

#include <asm/syscall_table.h>

#undef __SYSCALL

};

};





#define COLOUR_ALIGN(addr, pgoff) \

#define COLOUR_ALIGN(addr, pgoff) \

arch/xtensa/kernel/syscalls/Makefile

+2 −5
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ 




syscall := $(src)/syscall.tbl

syscall := $(src)/syscall.tbl

syshdr := $(srctree)/$(src)/syscallhdr.sh

syshdr := $(srctree)/$(src)/syscallhdr.sh

systbl := $(srctree)/$(src)/syscalltbl.sh

systbl := $(srctree)/scripts/syscalltbl.sh





quiet_cmd_syshdr = SYSHDR  $@

quiet_cmd_syshdr = SYSHDR  $@

      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@'	\

      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@'	\
@@ -16,10 +16,7 @@ quiet_cmd_syshdr = SYSHDR $@ 
		   '$(syshdr_offset_$(basetarget))'

		   '$(syshdr_offset_$(basetarget))'





quiet_cmd_systbl = SYSTBL  $@

quiet_cmd_systbl = SYSTBL  $@

      cmd_systbl = $(CONFIG_SHELL) '$(systbl)' '$<' '$@'	\

      cmd_systbl = $(CONFIG_SHELL) $(systbl) $< $@

		   '$(systbl_abis_$(basetarget))'		\

		   '$(systbl_abi_$(basetarget))'		\

		   '$(systbl_offset_$(basetarget))'





$(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE

$(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE

	$(call if_changed,syshdr)

	$(call if_changed,syshdr)

arch/xtensa/kernel/syscalls/syscalltbl.sh

deleted100644 → 0
+0 −32
Original line number Original line Diff line number Diff line 
#!/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"