From 9d872e6d6c1ceb2b02908cbfb30618bc067e73bd Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sun, 4 Oct 2009 09:34:17 +0200 Subject: [PATCH] --- yaml --- r: 167113 b: refs/heads/master c: eaaea8036d0261d87d7072c5bc88c7ea730c18ac h: refs/heads/master i: 167111: dbf751a770fe4a070443d40eeabff4eed27b7343 v: v3 --- [refs] | 2 +- trunk/kernel/futex.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f4d133369322..0da06186f17a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d014e8894dfc523dd9d2f2a17b6dcb94facea810 +refs/heads/master: eaaea8036d0261d87d7072c5bc88c7ea730c18ac diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c index 463af2efa512..1e176f3ab26c 100644 --- a/trunk/kernel/futex.c +++ b/trunk/kernel/futex.c @@ -916,8 +916,8 @@ futex_wake_op(u32 __user *uaddr1, int fshared, u32 __user *uaddr2, hb1 = hash_futex(&key1); hb2 = hash_futex(&key2); - double_lock_hb(hb1, hb2); retry_private: + double_lock_hb(hb1, hb2); op_ret = futex_atomic_op_inuser(op, uaddr2); if (unlikely(op_ret < 0)) {