---

yaml --- r: 126801 b: refs/heads/master c: 90621c4 h: refs/heads/master i: 126799: a527c6a v: v3
git-mirror · Jan 2, 2009 · 7d8af24 · 7d8af24
1 parent 6b00662
commit 7d8af24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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: