Skip to content

Commit

Permalink
futex: remove the pointer math from double_unlock_hb
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Darren Hart authored and Ingo Molnar committed Mar 13, 2009
1 parent e4dc5b7 commit f061d35
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions kernel/futex.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit f061d35

Please sign in to comment.