aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-03-27 04:16:28 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 11:44:50 -0500
commit76b81e2b0e2241accebcc68e126bc5ab958661b9 (patch)
tree0d99cdc838cc2e7a5c383a56ec707ac739739d2c
parent8f17d3a5049d32392b79925c73a0cf99ce6d5af0 (diff)
[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>
-rw-r--r--include/linux/futex.h14
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
99long do_futex(unsigned long uaddr, int op, int val, 93long 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,