diff --git a/[refs] b/[refs] index 859d796497eb..f1ebc07f46a1 100644 --- 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 index 05018bfe21a7..5551adaf7cdf 100644 --- 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);