From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753479AbcDVJn4 (ORCPT ); Fri, 22 Apr 2016 05:43:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36344 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751707AbcDVJny (ORCPT ); Fri, 22 Apr 2016 05:43:54 -0400 Date: Fri, 22 Apr 2016 02:43:06 -0700 From: tip-bot for Michal Hocko Message-ID: Cc: tglx@linutronix.de, mhocko@suse.com, peterz@infradead.org, mingo@kernel.org, jason.low2@hp.com, jcmvbkbc@gmail.com, chris@zankel.net, torvalds@linux-foundation.org, tony.luck@intel.com, akpm@linux-foundation.org, paulmck@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, dbueso@suse.de, davem@davemloft.net, hpa@zytor.com Reply-To: jcmvbkbc@gmail.com, torvalds@linux-foundation.org, chris@zankel.net, akpm@linux-foundation.org, tony.luck@intel.com, hpa@zytor.com, davem@davemloft.net, paulmck@linux.vnet.ibm.com, dbueso@suse.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, mhocko@suse.com, peterz@infradead.org, jason.low2@hp.com In-Reply-To: <1460041951-22347-9-git-send-email-mhocko@kernel.org> References: <1460041951-22347-9-git-send-email-mhocko@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/rwsem] locking/rwsem, ia64: Provide __down_write_killable() Git-Commit-ID: a02137eb5177e7afc8dfa52a2888c1f2f4840739 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a02137eb5177e7afc8dfa52a2888c1f2f4840739 Gitweb: http://git.kernel.org/tip/a02137eb5177e7afc8dfa52a2888c1f2f4840739 Author: Michal Hocko AuthorDate: Thu, 7 Apr 2016 17:12:28 +0200 Committer: Ingo Molnar CommitDate: Wed, 13 Apr 2016 10:42:21 +0200 locking/rwsem, ia64: Provide __down_write_killable() Introduce ___down_write() for the fast path and reuse it for __down_write() resp. __down_write_killable() each using the respective generic slow path (rwsem_down_write_failed() resp. rwsem_down_write_failed_killable()). Signed-off-by: Michal Hocko Cc: Andrew Morton Cc: Chris Zankel Cc: David S. Miller Cc: Linus Torvalds Cc: Max Filippov Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Signed-off-by: Davidlohr Bueso Cc: Signed-off-by: Jason Low Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-alpha@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-ia64@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: linux-sh@vger.kernel.org Cc: linux-xtensa@linux-xtensa.org Cc: sparclinux@vger.kernel.org Link: http://lkml.kernel.org/r/1460041951-22347-9-git-send-email-mhocko@kernel.org Signed-off-by: Ingo Molnar --- arch/ia64/include/asm/rwsem.h | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h index ce11247..8b23e07 100644 --- a/arch/ia64/include/asm/rwsem.h +++ b/arch/ia64/include/asm/rwsem.h @@ -49,8 +49,8 @@ __down_read (struct rw_semaphore *sem) /* * lock for writing */ -static inline void -__down_write (struct rw_semaphore *sem) +static inline long +___down_write (struct rw_semaphore *sem) { long old, new; @@ -59,10 +59,26 @@ __down_write (struct rw_semaphore *sem) new = old + RWSEM_ACTIVE_WRITE_BIAS; } while (cmpxchg_acq(&sem->count, old, new) != old); - if (old != 0) + return old; +} + +static inline void +__down_write (struct rw_semaphore *sem) +{ + if (___down_write(sem)) rwsem_down_write_failed(sem); } +static inline int +__down_write_killable (struct rw_semaphore *sem) +{ + if (___down_write(sem)) + if (IS_ERR(rwsem_down_write_failed_killable(sem))) + return -EINTR; + + return 0; +} + /* * unlock after reading */