History

Merge branch 'locking/futex' into locking/core, to pick up pending futex changes

Ingo Molnar committed 1 year ago

Commit 94ec7082 parents cdb7d2d 78272d435 files · +2479 −564Browse files

Showing the changes to include/uapi/linux (2 of 35 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/futex.h +8 −1
  2. include/uapi/linux/prctl.h +7 −0
include/uapi/linux/futex.h+8−1
@@ -63,7 +63,7 @@ · 62 unmodified lines
6363 #define FUTEX2_SIZE_U32 0x02
6464 #define FUTEX2_SIZE_U64 0x03
6565 #define FUTEX2_NUMA 0x04
66− /* 0x08 */
66+#define FUTEX2_MPOL 0x08
6767 /* 0x10 */
6868 /* 0x20 */
6969 /* 0x40 */
@@ -74,6 +74,13 @@ · 4 unmodified lines
7474 /* do not use */
7575 #define FUTEX_32 FUTEX2_SIZE_U32 /* historical accident :-( */
7676
77+/*
78+ * When FUTEX2_NUMA doubles the futex word, the second word is a node value.
79+ * The special value -1 indicates no-node. This is the same value as
80+ * NUMA_NO_NODE, except that value is not ABI, this is.
81+ */
82+#define FUTEX_NO_NODE (-1)
83+
7784 /*
7885 * Max numbers of elements in a futex_waitv array
7986 */
include/uapi/linux/prctl.h+7−0
@@ -364,4 +364,11 @@ struct prctl_mm_map { · 363 unmodified lines
364364 # define PR_TIMER_CREATE_RESTORE_IDS_ON 1
365365 # define PR_TIMER_CREATE_RESTORE_IDS_GET 2
366366
367+/* FUTEX hash management */
368+#define PR_FUTEX_HASH 78
369+# define PR_FUTEX_HASH_SET_SLOTS 1
370+# define FH_FLAG_IMMUTABLE (1ULL << 0)
371+# define PR_FUTEX_HASH_GET_SLOTS 2
372+# define PR_FUTEX_HASH_GET_IMMUTABLE 3
373+
367374 #endif /* _LINUX_PRCTL_H */