---

yaml --- r: 242508 b: refs/heads/master c: 2909620 h: refs/heads/master v: v3
git-mirror · Mar 25, 2011 · 8655f37 · 8655f37
1 parent 0e93680
commit 8655f37
Show file tree

Hide file tree

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