diff options
author | Darren Hart <dvhltc@us.ibm.com> | 2009-03-12 18:11:18 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 20:15:46 -0400 |
commit | f061d35150003b7fd5b133d14d66a74500fdaa60 (patch) | |
tree | 4181a2a13841804ed6ccb4345d2b340eeba941a2 | |
parent | e4dc5b7a36a49eff97050894cf1b3a9a02523717 (diff) |
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 9c97f67d298e..2331b73f6932 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) | |||
658 | static inline void | 658 | static inline void |
659 | double_unlock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2) | 659 | double_unlock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2) |
660 | { | 660 | { |
661 | if (hb1 <= hb2) { | 661 | spin_unlock(&hb1->lock); |
662 | spin_unlock(&hb2->lock); | 662 | spin_unlock(&hb2->lock); |
663 | if (hb1 < hb2) | ||
664 | spin_unlock(&hb1->lock); | ||
665 | } else { /* hb1 > hb2 */ | ||
666 | spin_unlock(&hb1->lock); | ||
667 | spin_unlock(&hb2->lock); | ||
668 | } | ||
669 | } | 663 | } |
670 | 664 | ||
671 | /* | 665 | /* |