diff --git a/[refs] b/[refs]
index d61d7c85c9bc..a38e576f1adb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42d35d48ce7cefb9429880af19d1c329d1554e7a
+refs/heads/master: 90621c40cc4ab7b0a414311ce37e7cc7173403b6
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index c5ac55cc0c16..206d4c906885 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -170,8 +170,11 @@ static void get_futex_key_refs(union futex_key *key)
  */
 static void drop_futex_key_refs(union futex_key *key)
 {
-	if (!key->both.ptr)
+	if (!key->both.ptr) {
+		/* If we're here then we tried to put a key we failed to get */
+		WARN_ON_ONCE(1);
 		return;
+	}
 
 	switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) {
 	case FUT_OFF_INODE: