Skip to content

Commit 463b1b2

Browse files
committed
Merge tag 'locking_urgent_for_v6.16_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Borislav Petkov: - Disable FUTEX_PRIVATE_HASH for this cycle due to a performance regression - Add a selftests compilation product to the corresponding .gitignore file * tag 'locking_urgent_for_v6.16_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: selftests/futex: Add futex_numa to .gitignore futex: Temporary disable FUTEX_PRIVATE_HASH
2 parents c92bda4 + 46b0a67 commit 463b1b2

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

init/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,9 +1716,13 @@ config FUTEX_PI
17161716
depends on FUTEX && RT_MUTEXES
17171717
default y
17181718

1719+
#
1720+
# marked broken for performance reasons; gives us one more cycle to sort things out.
1721+
#
17191722
config FUTEX_PRIVATE_HASH
17201723
bool
17211724
depends on FUTEX && !BASE_SMALL && MMU
1725+
depends on BROKEN
17221726
default y
17231727

17241728
config FUTEX_MPOL

tools/testing/selftests/futex/functional/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ futex_wait_timeout
1111
futex_wait_uninitialized_heap
1212
futex_wait_wouldblock
1313
futex_waitv
14+
futex_numa

0 commit comments

Comments
 (0)