tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

arc: convert to generic syscall table

The uapi/asm/unistd_32.h and asm/syscall_table_32.h headers can now be
generated from scripts/syscall.tbl, which makes this consistent with
the other architectures that have their own syscall.tbl.

arc has a couple of architecture specific system calls, which I add to the
generic table. This for some reason includes the deprecated sys_sysfs()
syscall that was presumably added by accident.

The time32, renameat, stat64 and rlimit entries in the syscall_abis_32
entry are for system calls that were part of the generic ABI when arch/arc
got added but are no longer enabled by default for new architectures.

Both the user visible side of asm/unistd.h and the internal syscall
table in the kernel should have the same effective contents after this.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 4414ad8e 505d66d1

+30 -44
+2
arch/arc/include/asm/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 + syscall-y += syscall_table_32.h 3 + 2 4 generic-y += extable.h 3 5 generic-y += kvm_para.h 4 6 generic-y += mcs_spinlock.h
+14
arch/arc/include/asm/unistd.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 + #ifndef _ASM_ARC_UNISTD_H 3 + #define _ASM_ARC_UNISTD_H 4 + 5 + #include <uapi/asm/unistd.h> 6 + 7 + #define __ARCH_WANT_STAT64 8 + #define __ARCH_WANT_SYS_CLONE 9 + #define __ARCH_WANT_SYS_VFORK 10 + #define __ARCH_WANT_SYS_FORK 11 + 12 + #define NR_syscalls __NR_syscalls 13 + 14 + #endif
+2
arch/arc/include/uapi/asm/Kbuild
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 + syscall-y += unistd_32.h 3 + 2 4 generic-y += ucontext.h
+1 -42
arch/arc/include/uapi/asm/unistd.h
··· 7 7 * published by the Free Software Foundation. 8 8 */ 9 9 10 - /******** no-legacy-syscalls-ABI *******/ 11 - 12 - /* 13 - * Non-typical guard macro to enable inclusion twice in ARCH sys.c 14 - * That is how the Generic syscall wrapper generator works 15 - */ 16 - #if !defined(_UAPI_ASM_ARC_UNISTD_H) || defined(__SYSCALL) 17 - #define _UAPI_ASM_ARC_UNISTD_H 18 - 19 - #define __ARCH_WANT_RENAMEAT 20 - #define __ARCH_WANT_STAT64 21 - #define __ARCH_WANT_SET_GET_RLIMIT 22 - #define __ARCH_WANT_SYS_EXECVE 23 - #define __ARCH_WANT_SYS_CLONE 24 - #define __ARCH_WANT_SYS_VFORK 25 - #define __ARCH_WANT_SYS_FORK 26 - #define __ARCH_WANT_TIME32_SYSCALLS 27 - 28 - #define sys_mmap2 sys_mmap_pgoff 29 - 30 - #include <asm-generic/unistd.h> 31 - 32 - #define NR_syscalls __NR_syscalls 33 - 34 - /* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */ 35 - #define __NR_sysfs (__NR_arch_specific_syscall + 3) 36 - 37 - /* ARC specific syscall */ 38 - #define __NR_cacheflush (__NR_arch_specific_syscall + 0) 39 - #define __NR_arc_settls (__NR_arch_specific_syscall + 1) 40 - #define __NR_arc_gettls (__NR_arch_specific_syscall + 2) 41 - #define __NR_arc_usr_cmpxchg (__NR_arch_specific_syscall + 4) 42 - 43 - __SYSCALL(__NR_cacheflush, sys_cacheflush) 44 - __SYSCALL(__NR_arc_settls, sys_arc_settls) 45 - __SYSCALL(__NR_arc_gettls, sys_arc_gettls) 46 - __SYSCALL(__NR_arc_usr_cmpxchg, sys_arc_usr_cmpxchg) 47 - __SYSCALL(__NR_sysfs, sys_sysfs) 48 - 49 - #undef __SYSCALL 50 - 51 - #endif 10 + #include <asm/unistd_32.h>
+3
arch/arc/kernel/Makefile.syscalls
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + 3 + syscall_abis_32 += arc time32 renameat stat64 rlimit
+3 -2
arch/arc/kernel/sys.c
··· 8 8 9 9 #define sys_clone sys_clone_wrapper 10 10 #define sys_clone3 sys_clone3_wrapper 11 + #define sys_mmap2 sys_mmap_pgoff 11 12 12 - #undef __SYSCALL 13 13 #define __SYSCALL(nr, call) [nr] = (call), 14 + #define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, native) 14 15 15 16 void *sys_call_table[NR_syscalls] = { 16 17 [0 ... NR_syscalls-1] = sys_ni_syscall, 17 - #include <asm/unistd.h> 18 + #include <asm/syscall_table_32.h> 18 19 };
+5
scripts/syscall.tbl
··· 288 288 243 time32 recvmmsg sys_recvmmsg_time32 compat_sys_recvmmsg_time32 289 289 243 64 recvmmsg sys_recvmmsg 290 290 # Architectures may provide up to 16 syscalls of their own between 244 and 259 291 + 244 arc cacheflush sys_cacheflush 292 + 245 arc arc_settls sys_arc_settls 293 + 246 arc arc_gettls sys_arc_gettls 294 + 247 arc sysfs sys_sysfs 295 + 248 arc arc_usr_cmpxchg sys_arc_usr_cmpxchg 291 296 260 time32 wait4 sys_wait4 compat_sys_wait4 292 297 260 64 wait4 sys_wait4 293 298 261 common prlimit64 sys_prlimit64