Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76b81e2b authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8f17d3a5

include/linux/futex.h

+4 −10
Original line number Diff line number Diff line
@@ -79,22 +79,16 @@ 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,