Commit bf8a9a47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull more vfs mount updates from Al Viro:
 "Propagation of new syscalls to other architectures + cosmetic change
  from Christian (fscontext didn't follow the convention for anon inode
  names)"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  uapi: Wire up the mount API syscalls on non-x86 arches [ver #2]
  uapi, x86: Fix the syscall numbering of the mount API syscalls [ver #2]
  uapi, fsopen: use square brackets around "fscontext" [ver #2]
parents a6a4b66b d8076bdb

arch/alpha/kernel/syscalls/syscall.tbl

+6 −0
Original line number Diff line number Diff line
@@ -467,3 +467,9 @@ 
535	common	io_uring_setup			sys_io_uring_setup

536	common	io_uring_enter			sys_io_uring_enter

537	common	io_uring_register		sys_io_uring_register

538	common	open_tree			sys_open_tree

539	common	move_mount			sys_move_mount

540	common	fsopen				sys_fsopen

541	common	fsconfig			sys_fsconfig

542	common	fsmount				sys_fsmount

543	common	fspick				sys_fspick

arch/arm/tools/syscall.tbl

+6 −0
Original line number Diff line number Diff line
@@ -441,3 +441,9 @@ 
425	common	io_uring_setup			sys_io_uring_setup

426	common	io_uring_enter			sys_io_uring_enter

427	common	io_uring_register		sys_io_uring_register

428	common	open_tree			sys_open_tree

429	common	move_mount			sys_move_mount

430	common	fsopen				sys_fsopen

431	common	fsconfig			sys_fsconfig

432	common	fsmount				sys_fsmount

433	common	fspick				sys_fspick

arch/arm64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE + 5)

#define __ARM_NR_COMPAT_END		(__ARM_NR_COMPAT_BASE + 0x800)



#define __NR_compat_syscalls		428

#define __NR_compat_syscalls		434

#endif



#define __ARCH_WANT_SYS_CLONE

arch/arm64/include/asm/unistd32.h

+12 −0
Original line number Diff line number Diff line
@@ -874,6 +874,18 @@ __SYSCALL(__NR_io_uring_setup, sys_io_uring_setup) 
__SYSCALL(__NR_io_uring_enter, sys_io_uring_enter)

#define __NR_io_uring_register 427

__SYSCALL(__NR_io_uring_register, sys_io_uring_register)

#define __NR_open_tree 428

__SYSCALL(__NR_open_tree, sys_open_tree)

#define __NR_move_mount 429

__SYSCALL(__NR_move_mount, sys_move_mount)

#define __NR_fsopen 430

__SYSCALL(__NR_fsopen, sys_fsopen)

#define __NR_fsconfig 431

__SYSCALL(__NR_fsconfig, sys_fsconfig)

#define __NR_fsmount 432

__SYSCALL(__NR_fsmount, sys_fsmount)

#define __NR_fspick 433

__SYSCALL(__NR_fspick, sys_fspick)



/*

 * Please add new compat syscalls above this comment and update

arch/ia64/kernel/syscalls/syscall.tbl

+6 −0
Original line number Diff line number Diff line
@@ -348,3 +348,9 @@ 
425	common	io_uring_setup			sys_io_uring_setup

426	common	io_uring_enter			sys_io_uring_enter

427	common	io_uring_register		sys_io_uring_register

428	common	open_tree			sys_open_tree

429	common	move_mount			sys_move_mount

430	common	fsopen				sys_fsopen

431	common	fsconfig			sys_fsconfig

432	common	fsmount				sys_fsmount

433	common	fspick				sys_fspick

CRA Git | Maintained and supported by SUSTech CRA and CCSE