summaryrefslogtreecommitdiff
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2025-05-25 10:10:08 +0200
committerIngo Molnar <mingo@kernel.org>2025-05-25 10:10:08 +0200
commit94ec70880fd376dd5cc60ba2bd7ddf830b3d4f28 (patch)
treef0cb51c5eeadc2927c648b49c713f10809db5fd5 /kernel/sys.c
parentcdb7d2d68cde6145a06a56c9d5d5d917297501c6 (diff)
parent78272d44970c07899c78661f6b7492b5a7e14a90 (diff)
Merge branch 'locking/futex' into locking/core, to pick up pending futex changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index c434968e9f5dd..adc0de0aa364a 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -52,6 +52,7 @@
#include <linux/user_namespace.h>
#include <linux/time_namespace.h>
#include <linux/binfmts.h>
+#include <linux/futex.h>
#include <linux/sched.h>
#include <linux/sched/autogroup.h>
@@ -2820,6 +2821,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
return -EINVAL;
error = posixtimer_create_prctl(arg2);
break;
+ case PR_FUTEX_HASH:
+ error = futex_hash_prctl(arg2, arg3, arg4);
+ break;
default:
trace_task_prctl_unknown(option, arg2, arg3, arg4, arg5);
error = -EINVAL;