From 66bb3c1f869e548f826cf638b93959c8aee845d1 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 1 Feb 2008 17:45:14 +0100 Subject: [PATCH] --- yaml --- r: 82007 b: refs/heads/master c: 83e96c604e781098a2f61b8a294919bcf3abfab4 h: refs/heads/master i: 82005: 0db4a2a9138de10c67a98b66eb81cb8a5444cc25 82003: da374fbe56d8249ffc691cfe5c0fefda42cdf42d 81999: d1d53cabb21b90c2da2f6a62262e4b1c833afe38 v: v3 --- [refs] | 2 +- trunk/kernel/futex.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 33fdfe8dc0bd..9c4566f7226e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d55b9923a1b7ea8193b8875c57ec940dc2ff027 +refs/heads/master: 83e96c604e781098a2f61b8a294919bcf3abfab4 diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c index 0edd314798c0..0006d64c448e 100644 --- a/trunk/kernel/futex.c +++ b/trunk/kernel/futex.c @@ -1537,9 +1537,6 @@ static int futex_lock_pi(u32 __user *uaddr, struct rw_semaphore *fshared, owner = rt_mutex_owner(&q.pi_state->pi_mutex); res = fixup_pi_state_owner(uaddr, &q, owner); - WARN_ON(rt_mutex_owner(&q.pi_state->pi_mutex) != - owner); - /* propagate -EFAULT, if the fixup failed */ if (res) ret = res;