From f1ca6a64460f0750298ca102766903f634432bcd Mon Sep 17 00:00:00 2001
From: Vernon Mauery <vernux@us.ibm.com>
Date: Sat, 1 Jul 2006 04:35:42 -0700
Subject: [PATCH] --- yaml --- r: 31532 b: refs/heads/master c:
 a99e4e413e1ab9f3c567b5519f5557afd786dc62 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7a65cf5ed85f..8163f0eab0d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9262e9149f346a5443300f8c451b8e7631e81a42
+refs/heads/master: a99e4e413e1ab9f3c567b5519f5557afd786dc62
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index 6c91f938005d..22aa3c16ca73 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -1208,7 +1208,7 @@ static int do_futex_lock_pi(u32 __user *uaddr, int detect, int trylock,
 	}
 
 	down_read(&curr->mm->mmap_sem);
-	hb = queue_lock(&q, -1, NULL);
+	spin_lock(q.lock_ptr);
 
 	/*
 	 * Got the lock. We might not be the anticipated owner if we