Commit 52e856c3 authored Sep 28, 2023 by Jens Axboe

Merge branch 'locking/core' of...

Merge branch 'locking/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into io_uring-futex

Pull in locking/core from the tip tree, to get the futex2 dependencies
from Peter Zijlstra.

* 'locking/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  locking/ww_mutex/test: Make sure we bail out instead of livelock
  locking/ww_mutex/test: Fix potential workqueue corruption
  locking/ww_mutex/test: Use prng instead of rng to avoid hangs at bootup
  futex: Add sys_futex_requeue()
  futex: Add flags2 argument to futex_requeue()
  futex: Propagate flags into get_futex_key()
  futex: Add sys_futex_wait()
  futex: FLAGS_STRICT
  futex: Add sys_futex_wake()
  futex: Validate futex value against futex size
  futex: Flag conversion
  futex: Extend the FUTEX2 flags
  futex: Clarify FUTEX2 flags
  asm-generic: ticket-lock: Optimize arch_spin_value_unlocked()
  futex/pi: Fix recursive rt_mutex waiter state
  locking/rtmutex: Add a lockdep assert to catch potential nested blocking
  locking/rtmutex: Use rt_mutex specific scheduler helpers
  sched: Provide rt_mutex specific scheduler helpers
  sched: Extract __schedule_loop()
  locking/rtmutex: Avoid unconditional slowpath for DEBUG_RT_MUTEXES
  ...

parents 73c7e7a9 cfa92b6d

arch/alpha/kernel/syscalls/syscall.tbl

+3 −0

Original line number	Diff line number	Diff line
		@@ -492,3 +492,6 @@
		560 common set_mempolicy_home_node sys_ni_syscall
		561 common cachestat sys_cachestat
		562 common fchmodat2 sys_fchmodat2
		563 common futex_wake sys_futex_wake
		564 common futex_wait sys_futex_wait
		565 common futex_requeue sys_futex_requeue

arch/arm/tools/syscall.tbl

+3 −0

Original line number	Diff line number	Diff line
		@@ -466,3 +466,6 @@
		450 common set_mempolicy_home_node sys_set_mempolicy_home_node
		451 common cachestat sys_cachestat
		452 common fchmodat2 sys_fchmodat2
		454 common futex_wake sys_futex_wake
		455 common futex_wait sys_futex_wait
		456 common futex_requeue sys_futex_requeue

arch/arm64/include/asm/unistd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,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 453
		#define __NR_compat_syscalls 457
		#endif

		#define __ARCH_WANT_SYS_CLONE

arch/arm64/include/asm/unistd32.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -911,6 +911,12 @@ __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node)
		__SYSCALL(__NR_cachestat, sys_cachestat)
		#define __NR_fchmodat2 452
		__SYSCALL(__NR_fchmodat2, sys_fchmodat2)
		#define __NR_futex_wake 454
		__SYSCALL(__NR_futex_wake, sys_futex_wake)
		#define __NR_futex_wait 455
		__SYSCALL(__NR_futex_wait, sys_futex_wait)
		#define __NR_futex_requeue 456
		__SYSCALL(__NR_futex_requeue, sys_futex_requeue)

		/*
		* Please add new compat syscalls above this comment and update

arch/ia64/kernel/syscalls/syscall.tbl

+3 −0

Original line number	Diff line number	Diff line
		@@ -373,3 +373,6 @@
		450 common set_mempolicy_home_node sys_set_mempolicy_home_node
		451 common cachestat sys_cachestat
		452 common fchmodat2 sys_fchmodat2
		454 common futex_wake sys_futex_wake
		455 common futex_wait sys_futex_wait
		456 common futex_requeue sys_futex_requeue