summaryrefslogtreecommitdiffstats
path: root/kernel/futex
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2023-07-21 16:41:27 +0200
committerJens Axboe <axboe@kernel.dk>2023-09-29 10:36:16 +0200
commit3b0781595431acafe3db6596e12deb46975d91dd (patch)
tree594537329f40842ae7e1695d05056a142596b90e /kernel/futex
parentMerge branch 'locking/core' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-3b0781595431acafe3db6596e12deb46975d91dd.tar.xz
linux-3b0781595431acafe3db6596e12deb46975d91dd.zip
futex: move FUTEX2_VALID_MASK to futex.h
We need this for validating the futex2 flags outside of the normal futex syscalls. Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'kernel/futex')
-rw-r--r--kernel/futex/futex.h2
-rw-r--r--kernel/futex/syscalls.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex/futex.h b/kernel/futex/futex.h
index a06030a1a27b..a173a9d501e1 100644
--- a/kernel/futex/futex.h
+++ b/kernel/futex/futex.h
@@ -52,6 +52,8 @@ static inline unsigned int futex_to_flags(unsigned int op)
return flags;
}
+#define FUTEX2_VALID_MASK (FUTEX2_SIZE_MASK | FUTEX2_PRIVATE)
+
/* FUTEX2_ to FLAGS_ */
static inline unsigned int futex2_to_flags(unsigned int flags2)
{
diff --git a/kernel/futex/syscalls.c b/kernel/futex/syscalls.c
index 8200d86d30e1..2b5cafdfdc50 100644
--- a/kernel/futex/syscalls.c
+++ b/kernel/futex/syscalls.c
@@ -179,8 +179,6 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
return do_futex(uaddr, op, val, tp, uaddr2, (unsigned long)utime, val3);
}
-#define FUTEX2_VALID_MASK (FUTEX2_SIZE_MASK | FUTEX2_PRIVATE)
-
/**
* futex_parse_waitv - Parse a waitv array from userspace
* @futexv: Kernel side list of waiters to be filled