From 7d8af24157d52ea7d18526eb8d94b04a2ba24c3c Mon Sep 17 00:00:00 2001
From: Darren Hart <dvhltc@us.ibm.com>
Date: Mon, 29 Dec 2008 19:43:21 -0800
Subject: [PATCH] --- yaml --- r: 126801 b: refs/heads/master c:
 90621c40cc4ab7b0a414311ce37e7cc7173403b6 h: refs/heads/master i:   126799:
 a527c6ae6ccaccce7f403641578195276418c8fa v: v3

---
 [refs]               | 2 +-
 trunk/kernel/futex.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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: