From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756828AbZCLWLc (ORCPT ); Thu, 12 Mar 2009 18:11:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754359AbZCLWLY (ORCPT ); Thu, 12 Mar 2009 18:11:24 -0400 Received: from e38.co.us.ibm.com ([32.97.110.159]:47238 "EHLO e38.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753815AbZCLWLX (ORCPT ); Thu, 12 Mar 2009 18:11:23 -0400 From: Darren Hart Subject: [PATCH] futex: remove the pointer math from double_unlock_hb To: linux-kernel@vger.kernel.org Cc: Darren Hart , Thomas Gleixner , Peter Zijlstra , Ingo Molnar , Rusty Russell Date: Thu, 12 Mar 2009 15:11:18 -0700 Message-ID: <20090312221118.11146.68610.stgit@Aeon> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Rusty Russell --- 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); } /*