1 files changed, 19 insertions, 3 deletions

diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h
index ce112472bdd6..8b23e070b844 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
  */