---

yaml --- r: 321347 b: refs/heads/master c: f27071c h: refs/heads/master i: 321345: e93b6e8 321343: d16fe3a v: v3
git-mirror · Jul 24, 2012 · 86ed3cb · 86ed3cb
1 parent fb92013
commit 86ed3cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6070a8d9853eda010a549fa9a09eb8d7269b929
+refs/heads/master: f27071cb7fe3e1d37a9dbe6c0dfc5395cd40fa43
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -2343,7 +2343,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
 		 * signal.  futex_unlock_pi() will not destroy the lock_ptr nor
 		 * the pi_state.
 		 */
-		WARN_ON(!&q.pi_state);
+		WARN_ON(!q.pi_state);
 		pi_mutex = &q.pi_state->pi_mutex;
 		ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter, 1);
 		debug_rt_mutex_free_waiter(&rt_waiter);