diff --git a/[refs] b/[refs]
index 57a05a9d9c9e..5d75f93e2d9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f17d3a5049d32392b79925c73a0cf99ce6d5af0
+refs/heads/master: 76b81e2b0e2241accebcc68e126bc5ab958661b9
diff --git a/trunk/include/linux/futex.h b/trunk/include/linux/futex.h
index 55fff96ae859..966a5b3da439 100644
--- a/trunk/include/linux/futex.h
+++ b/trunk/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,