Commit 5e321ded authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.13/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc architecture updates from Helge Deller:

 - switch to generic syscall header scripts

 - minor typo fix in setup.c

* tag 'for-5.13/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix typo in setup.c
  parisc: syscalls: switch to generic syscallhdr.sh
  parisc: syscalls: switch to generic syscalltbl.sh
parents cda689f8 127f1c09

arch/parisc/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generated-y += syscall_table_32.h

generated-y += syscall_table_64.h

generated-y += syscall_table_c32.h

generic-y += kvm_para.h

generic-y += mcs_spinlock.h

generic-y += user.h

arch/parisc/kernel/syscall.S

+7 −9
Original line number Diff line number Diff line
@@ -919,24 +919,24 @@ ENTRY(lws_table) 
END(lws_table)

	/* End of lws table */



#ifdef CONFIG_64BIT

#define __SYSCALL_WITH_COMPAT(nr, native, compat)	__SYSCALL(nr, compat)

#else

#define __SYSCALL_WITH_COMPAT(nr, native, compat)	__SYSCALL(nr, native)

#endif

#define __SYSCALL(nr, entry)	ASM_ULONG_INSN entry

	.align 8

ENTRY(sys_call_table)

	.export sys_call_table,data

#ifdef CONFIG_64BIT

#include <asm/syscall_table_c32.h>   /* Compat syscalls */

#else

#include <asm/syscall_table_32.h>    /* 32-bit native syscalls */

#endif

#include <asm/syscall_table_32.h>    /* 32-bit syscalls */

END(sys_call_table)



#ifdef CONFIG_64BIT

	.align 8

ENTRY(sys_call_table64)

#include <asm/syscall_table_64.h>    /* 64-bit native syscalls */

#include <asm/syscall_table_64.h>    /* 64-bit syscalls */

END(sys_call_table64)

#endif

#undef __SYSCALL



	/*

		All light-weight-syscall atomic operations
@@ -961,5 +961,3 @@ END(lws_lock_start) 
	.previous



.end

arch/parisc/kernel/syscalls/Makefile

+9 −21
Original line number Diff line number Diff line
@@ -6,46 +6,34 @@ _dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \ 
	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')



syscall := $(src)/syscall.tbl

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

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

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

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



quiet_cmd_syshdr = SYSHDR  $@

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

		   '$(syshdr_abis_$(basetarget))'		\

		   '$(syshdr_pfx_$(basetarget))'		\

		   '$(syshdr_offset_$(basetarget))'

      cmd_syshdr = $(CONFIG_SHELL) $(syshdr) --emit-nr --abis $(abis) $< $@



quiet_cmd_systbl = SYSTBL  $@

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

		   '$(systbl_abis_$(basetarget))'		\

		   '$(systbl_abi_$(basetarget))'		\

		   '$(systbl_offset_$(basetarget))'

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



syshdr_abis_unistd_32 := common,32

$(uapi)/unistd_32.h: abis := common,32

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

	$(call if_changed,syshdr)



syshdr_abis_unistd_64 := common,64

$(uapi)/unistd_64.h: abis := common,64

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

	$(call if_changed,syshdr)



systbl_abis_syscall_table_32 := common,32

$(kapi)/syscall_table_32.h: abis := common,32

$(kapi)/syscall_table_32.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



systbl_abis_syscall_table_64 := common,64

$(kapi)/syscall_table_64.h: abis := common,64

$(kapi)/syscall_table_64.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



systbl_abis_syscall_table_c32 := common,32

systbl_abi_syscall_table_c32 := c32

$(kapi)/syscall_table_c32.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



uapisyshdr-y		+= unistd_32.h unistd_64.h

kapisyshdr-y		+= syscall_table_32.h		\

			   syscall_table_64.h		\

			   syscall_table_c32.h

			   syscall_table_64.h



uapisyshdr-y	:= $(addprefix $(uapi)/, $(uapisyshdr-y))

kapisyshdr-y	:= $(addprefix $(kapi)/, $(kapisyshdr-y))

arch/parisc/kernel/syscalls/syscallhdr.sh

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



in="$1"

out="$2"

my_abis=`echo "($3)" | tr ',' '|'`

prefix="$4"

offset="$5"



fileguard=_UAPI_ASM_PARISC_`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 | (

	printf "#ifndef %s\n" "${fileguard}"

	printf "#define %s\n" "${fileguard}"

	printf "\n"



	nxt=0

	while read nr abi name entry compat ; do

		if [ -z "$offset" ]; then

			printf "#define __NR_%s%s\t%s\n" \

				"${prefix}" "${name}" "${nr}"

		else

			printf "#define __NR_%s%s\t(%s + %s)\n" \

				"${prefix}" "${name}" "${offset}" "${nr}"

		fi

		nxt=$((nr+1))

	done



	printf "\n"

	printf "#ifdef __KERNEL__\n"

	printf "#define __NR_syscalls\t%s\n" "${nxt}"

	printf "#endif\n"

	printf "\n"

	printf "#endif /* %s */\n" "${fileguard}"

) > "$out"

arch/parisc/kernel/syscalls/syscalltbl.sh

deleted100644 → 0
+0 −36
Original line number 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 compat ; do

		if [ "$my_abi" = "c32" ] && [ ! -z "$compat" ]; then

			emit $((nxt+offset)) $((nr+offset)) $compat

		else

			emit $((nxt+offset)) $((nr+offset)) $entry

		fi

		nxt=$((nr+1))

	done

) > "$out"

arch/parisc/kernel/setup.c

+1 −1

File changed.

Contains only whitespace changes.