From 27c4d536a5bfa13f297800c2f1d01cb11787dee8 Mon Sep 17 00:00:00 2001
From: Darren Hart <dvhltc@us.ibm.com>
Date: Wed, 14 Oct 2009 10:12:39 -0700
Subject: [PATCH] --- yaml --- r: 167790 b: refs/heads/master c:
 2bc872036e1c5948b5b02942810bbdd8dbdb9812 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f57a54f1e970..1b59e22f3f2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d58e6576b0deec6f0b9ff8450fe282da18c50883
+refs/heads/master: 2bc872036e1c5948b5b02942810bbdd8dbdb9812
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index 5c88839bd993..06938e560ac9 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -150,7 +150,8 @@ static struct futex_hash_bucket *hash_futex(union futex_key *key)
  */
 static inline int match_futex(union futex_key *key1, union futex_key *key2)
 {
-	return (key1->both.word == key2->both.word
+	return (key1 && key2
+		&& key1->both.word == key2->both.word
 		&& key1->both.ptr == key2->both.ptr
 		&& key1->both.offset == key2->both.offset);
 }