Skip to content

Commit daadb3b

Browse files
torvaldstorvalds
committed
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().
2 parents 6ae7143 + f16cc98 commit daadb3b

45 files changed

Lines changed: 240 additions & 225 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎arch/alpha/include/asm/spinlock_types.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef _ALPHA_SPINLOCK_TYPES_H
33
#define _ALPHA_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
5+
#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
66
# error "please don't include this file directly"
77
#endif
88

‎arch/arc/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ config ARC
3232
select HAVE_ARCH_TRANSPARENT_HUGEPAGE if ARC_MMU_V4
3333
select HAVE_DEBUG_STACKOVERFLOW
3434
select HAVE_DEBUG_KMEMLEAK
35-
select HAVE_FUTEX_CMPXCHG if FUTEX
3635
select HAVE_IOREMAP_PROT
3736
select HAVE_KERNEL_GZIP
3837
select HAVE_KERNEL_LZMA

‎arch/arm/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ config ARM
9393
select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
9494
select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG
9595
select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !(THUMB2_KERNEL && CC_IS_CLANG)
96-
select HAVE_FUTEX_CMPXCHG if FUTEX
9796
select HAVE_GCC_PLUGINS
9897
select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)
9998
select HAVE_IRQ_TIME_ACCOUNTING

‎arch/arm/include/asm/spinlock_types.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef __ASM_SPINLOCK_TYPES_H
33
#define __ASM_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
5+
#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
66
# error "please don't include this file directly"
77
#endif
88

‎arch/arm64/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ config ARM64
196196
select HAVE_REGS_AND_STACK_ACCESS_API
197197
select HAVE_POSIX_CPU_TIMERS_TASK_WORK
198198
select HAVE_FUNCTION_ARG_ACCESS_API
199-
select HAVE_FUTEX_CMPXCHG if FUTEX
200199
select MMU_GATHER_RCU_TABLE_FREE
201200
select HAVE_RSEQ
202201
select HAVE_STACKPROTECTOR

‎arch/arm64/include/asm/spinlock_types.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef __ASM_SPINLOCK_TYPES_H
66
#define __ASM_SPINLOCK_TYPES_H
77

8-
#if !defined(__LINUX_SPINLOCK_TYPES_H) && !defined(__ASM_SPINLOCK_H)
8+
#if !defined(__LINUX_SPINLOCK_TYPES_RAW_H) && !defined(__ASM_SPINLOCK_H)
99
# error "please don't include this file directly"
1010
#endif
1111

‎arch/csky/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ config CSKY
5252
select HAVE_FUNCTION_TRACER
5353
select HAVE_FUNCTION_GRAPH_TRACER
5454
select HAVE_FUNCTION_ERROR_INJECTION
55-
select HAVE_FUTEX_CMPXCHG if FUTEX && SMP
5655
select HAVE_FTRACE_MCOUNT_RECORD
5756
select HAVE_KERNEL_GZIP
5857
select HAVE_KERNEL_LZO

‎arch/csky/include/asm/spinlock_types.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef __ASM_CSKY_SPINLOCK_TYPES_H
44
#define __ASM_CSKY_SPINLOCK_TYPES_H
55

6-
#ifndef __LINUX_SPINLOCK_TYPES_H
6+
#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
77
# error "please don't include this file directly"
88
#endif
99

‎arch/hexagon/include/asm/spinlock_types.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef _ASM_SPINLOCK_TYPES_H
99
#define _ASM_SPINLOCK_TYPES_H
1010

11-
#ifndef __LINUX_SPINLOCK_TYPES_H
11+
#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
1212
# error "please don't include this file directly"
1313
#endif
1414

‎arch/ia64/include/asm/spinlock_types.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef _ASM_IA64_SPINLOCK_TYPES_H
33
#define _ASM_IA64_SPINLOCK_TYPES_H
44

5-
#ifndef __LINUX_SPINLOCK_TYPES_H
5+
#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
66
# error "please don't include this file directly"
77
#endif
88

0 commit comments

Comments
 (0)