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

Merge tag 'locking_core_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking updates from Borislav Petkov:
 "Lots of cleanups and preparation. Highlights:

   - futex: Cleanup and remove runtime futex_cmpxchg detection

   - rtmutex: Some fixes for the PREEMPT_RT locking infrastructure

   - kcsan: Share owner_on_cpu() between mutex,rtmutex and rwsem and
     annotate the racy owner->on_cpu access *once*.

   - atomic64: Dead-Code-Elemination"

[ Description above by Peter Zijlstra ]

* tag 'locking_core_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/atomic: atomic64: Remove unusable atomic ops
  futex: Fix additional regressions
  locking: Allow to include asm/spinlock_types.h from linux/spinlock_types_raw.h
  x86/mm: Include spinlock_t definition in pgtable.
  locking: Mark racy reads of owner->on_cpu
  locking: Make owner_on_cpu() into <linux/sched.h>
  lockdep/selftests: Adapt ww-tests for PREEMPT_RT
  lockdep/selftests: Skip the softirq related tests on PREEMPT_RT
  lockdep/selftests: Unbalanced migrate_disable() & rcu_read_lock().
  lockdep/selftests: Avoid using local_lock_{acquire|release}().
  lockdep: Remove softirq accounting on PREEMPT_RT.
  locking/rtmutex: Add rt_mutex_lock_nest_lock() and rt_mutex_lock_killable().
  locking/rtmutex: Squash self-deadlock check for ww_rt_mutex.
  locking: Remove rt_rwlock_is_contended().
  sched: Trigger warning if ->migration_disabled counter underflows.
  futex: Fix sparc32/m68k/nds32 build regression
  futex: Remove futex_cmpxchg detection
  futex: Ensure futex_atomic_cmpxchg_inatomic() is present
  kernel/locking: Use a pointer in ww_mutex_trylock().
parents 6ae71436 f16cc980

arch/alpha/include/asm/spinlock_types.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef _ALPHA_SPINLOCK_TYPES_H

#define _ALPHA_SPINLOCK_TYPES_H



#ifndef __LINUX_SPINLOCK_TYPES_H

#ifndef __LINUX_SPINLOCK_TYPES_RAW_H

# error "please don't include this file directly"

#endif

arch/arc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ config ARC 
	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if ARC_MMU_V4

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_IOREMAP_PROT

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ config ARM 
	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL

	select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG

	select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !(THUMB2_KERNEL && CC_IS_CLANG)

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GCC_PLUGINS

	select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_IRQ_TIME_ACCOUNTING

arch/arm/include/asm/spinlock_types.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef __ASM_SPINLOCK_TYPES_H

#define __ASM_SPINLOCK_TYPES_H



#ifndef __LINUX_SPINLOCK_TYPES_H

#ifndef __LINUX_SPINLOCK_TYPES_RAW_H

# error "please don't include this file directly"

#endif

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ config ARM64 
	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_POSIX_CPU_TIMERS_TASK_WORK

	select HAVE_FUNCTION_ARG_ACCESS_API

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select MMU_GATHER_RCU_TABLE_FREE

	select HAVE_RSEQ

	select HAVE_STACKPROTECTOR