From 8655f37ef5f7d286ff2667627d28df65b16c2e04 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 17 Mar 2011 15:21:07 -0400
Subject: [PATCH] --- yaml --- r: 242508 b: refs/heads/master c:
 29096202176ceaa5016a17ea2dd1aea19a4e90e2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4652f19413c4..f3f845a79bdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2092e6be82ec71ecbf5a8ceeef004bbcbdb78812
+refs/heads/master: 29096202176ceaa5016a17ea2dd1aea19a4e90e2
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index bda415715382..823aae3e2a96 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -782,8 +782,8 @@ static void __unqueue_futex(struct futex_q *q)
 {
 	struct futex_hash_bucket *hb;
 
-	if (WARN_ON(!q->lock_ptr || !spin_is_locked(q->lock_ptr)
-			|| plist_node_empty(&q->list)))
+	if (WARN_ON_SMP(!q->lock_ptr || !spin_is_locked(q->lock_ptr))
+	    || WARN_ON(plist_node_empty(&q->list)))
 		return;
 
 	hb = container_of(q->lock_ptr, struct futex_hash_bucket, lock);