Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / linux / futex.h

diff --git a/include/linux/futex.h b/include/linux/futex.h
index 55fff96ae85914c7d6138428a471bb8ef4a2a369..966a5b3da439b40232c269f44026733db5a76244 100644 (file)
--- a/include/linux/futex.h
+++ b/include/linux/futex.h
@@ -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,