diff options
| author | Darren Hart <dvhltc@us.ibm.com> | 2009-03-12 15:11:18 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:15:46 +0100 |
| commit | f061d35150003b7fd5b133d14d66a74500fdaa60 (patch) | |
| tree | 4181a2a13841804ed6ccb4345d2b340eeba941a2 | |
| parent | e4dc5b7a36a49eff97050894cf1b3a9a02523717 (diff) | |
| download | op-kernel-dev-f061d35150003b7fd5b133d14d66a74500fdaa60.zip op-kernel-dev-f061d35150003b7fd5b133d14d66a74500fdaa60.tar.gz | |
futex: remove the pointer math from double_unlock_hb
Impact: simplify code
I mistakenly included the pointer value ordering in the
double_unlock_hb() in my previous patch. It's only necessary
in the double_lock_hb() function. This patch removes it.
Signed-off-by: Darren Hart <dvhltc@us.ibm.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
LKML-Reference: <20090312221118.11146.68610.stgit@Aeon>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | kernel/futex.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 9c97f67..2331b73 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -658,14 +658,8 @@ double_lock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2) static inline void double_unlock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2) { - if (hb1 <= hb2) { - spin_unlock(&hb2->lock); - if (hb1 < hb2) - spin_unlock(&hb1->lock); - } else { /* hb1 > hb2 */ - spin_unlock(&hb1->lock); - spin_unlock(&hb2->lock); - } + spin_unlock(&hb1->lock); + spin_unlock(&hb2->lock); } /* |
