diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/futex.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/linux/futex.h b/include/linux/futex.h index 55fff96ae859..966a5b3da439 100644 --- a/include/linux/futex.h +++ b/include/linux/futex.h | |||
@@ -80,21 +80,15 @@ struct robust_list_head { | |||
80 | #define FUTEX_OWNER_DIED 0x40000000 | 80 | #define FUTEX_OWNER_DIED 0x40000000 |
81 | 81 | ||
82 | /* | 82 | /* |
83 | * Reserved bit: | ||
84 | */ | ||
85 | #define FUTEX_OWNER_PENDING 0x20000000 | ||
86 | |||
87 | /* | ||
88 | * The rest of the robust-futex field is for the TID: | 83 | * The rest of the robust-futex field is for the TID: |
89 | */ | 84 | */ |
90 | #define FUTEX_TID_MASK 0x1fffffff | 85 | #define FUTEX_TID_MASK 0x3fffffff |
91 | 86 | ||
92 | /* | 87 | /* |
93 | * A limit of one million locks held per thread (!) ought to be enough | 88 | * This limit protects against a deliberately circular list. |
94 | * for some time. This also protects against a deliberately circular | 89 | * (Not worth introducing an rlimit for it) |
95 | * list. Not worth introducing an rlimit for this: | ||
96 | */ | 90 | */ |
97 | #define ROBUST_LIST_LIMIT 1048576 | 91 | #define ROBUST_LIST_LIMIT 2048 |
98 | 92 | ||
99 | long do_futex(unsigned long uaddr, int op, int val, | 93 | long do_futex(unsigned long uaddr, int op, int val, |
100 | unsigned long timeout, unsigned long uaddr2, int val2, | 94 | unsigned long timeout, unsigned long uaddr2, int val2, |