From 8891726dc1aad9216741f1a1281da46906348d5a Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Sat, 23 Jan 2010 22:36:29 +0100 Subject: [PATCH] --- yaml --- r: 180227 b: refs/heads/master c: 5ecb01cfdf96c5f465192bdb2a4fd4a61a24c6cc h: refs/heads/master i: 180225: 90dd40f192ec1aa7a50643fb88f94abbc7040f0e 180223: d6ecfc0a2658379b0710cf00f231f5a199e10333 v: v3 --- [refs] | 2 +- trunk/kernel/futex.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d4570c01dbdb..d9d998b64ed1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6ad3e286d2c075a60b9f11075a2c55aeeeca2ad +refs/heads/master: 5ecb01cfdf96c5f465192bdb2a4fd4a61a24c6cc diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c index d9b3a2228f9d..17828033a639 100644 --- a/trunk/kernel/futex.c +++ b/trunk/kernel/futex.c @@ -1971,7 +1971,7 @@ static int futex_lock_pi(u32 __user *uaddr, int fshared, /* Unqueue and drop the lock */ unqueue_me_pi(&q); - goto out; + goto out_put_key; out_unlock_put_key: queue_unlock(&q, hb);