summaryrefslogtreecommitdiffstats
path: root/kernel/futex
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2023-09-18 22:17:15 +0200
committerIngo Molnar <mingo@kernel.org>2023-09-18 22:17:15 +0200
commit6f23fc47c1b2ac226704fb7294f43ed3b0965e51 (patch)
tree079303a4d4ed8489537ab300f129581ec9ca2594 /kernel/futex
parentfutex: Use a folio instead of a page (diff)
parentLinux 6.6-rc2 (diff)
downloadlinux-6f23fc47c1b2ac226704fb7294f43ed3b0965e51.tar.xz
linux-6f23fc47c1b2ac226704fb7294f43ed3b0965e51.zip
Merge tag 'v6.6-rc2' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/futex')
-rw-r--r--kernel/futex/core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/futex/core.c b/kernel/futex/core.c
index adf7e2c1c8f4..d1d7b3c175a4 100644
--- a/kernel/futex/core.c
+++ b/kernel/futex/core.c
@@ -1131,8 +1131,7 @@ static int __init futex_init(void)
#endif
futex_queues = alloc_large_system_hash("futex", sizeof(*futex_queues),
- futex_hashsize, 0,
- futex_hashsize < 256 ? HASH_SMALL : 0,
+ futex_hashsize, 0, 0,
&futex_shift, NULL,
futex_hashsize, futex_hashsize);
futex_hashsize = 1UL << futex_shift;