Commit f061d351 authored Mar 12, 2009 by Darren Hart Committed by Ingo Molnar Mar 13, 2009

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>

parent e4dc5b7a

kernel/futex.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -658,15 +658,9 @@ 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);
		}
		}

		/*
		* Wake up waiters matching bitset queued on this futex (uaddr).