diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-03-27 01:16:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:44:50 -0800 |
commit | 76b81e2b0e2241accebcc68e126bc5ab958661b9 (patch) | |
tree | 0d99cdc838cc2e7a5c383a56ec707ac739739d2c /include/linux/futex.h | |
parent | 8f17d3a5049d32392b79925c73a0cf99ce6d5af0 (diff) | |
download | linux-3.10-76b81e2b0e2241accebcc68e126bc5ab958661b9.tar.gz linux-3.10-76b81e2b0e2241accebcc68e126bc5ab958661b9.tar.bz2 linux-3.10-76b81e2b0e2241accebcc68e126bc5ab958661b9.zip |
[PATCH] lightweight robust futexes updates 2
futex.h updates:
- get rid of FUTEX_OWNER_PENDING - it's not used
- reduce ROBUST_LIST_LIMIT to a saner value
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/futex.h')
-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 55fff96ae85..966a5b3da43 100644 --- a/include/linux/futex.h +++ b/include/linux/futex.h @@ -80,21 +80,15 @@ struct robust_list_head { #define FUTEX_OWNER_DIED 0x40000000 /* - * Reserved bit: - */ -#define FUTEX_OWNER_PENDING 0x20000000 - -/* * The rest of the robust-futex field is for the TID: */ -#define FUTEX_TID_MASK 0x1fffffff +#define FUTEX_TID_MASK 0x3fffffff /* - * A limit of one million locks held per thread (!) ought to be enough - * for some time. This also protects against a deliberately circular - * list. Not worth introducing an rlimit for this: + * This limit protects against a deliberately circular list. + * (Not worth introducing an rlimit for it) */ -#define ROBUST_LIST_LIMIT 1048576 +#define ROBUST_LIST_LIMIT 2048 long do_futex(unsigned long uaddr, int op, int val, unsigned long timeout, unsigned long uaddr2, int val2, |