Merge ../linux-2.6 by hand

1 files changed, 5 insertions, 0 deletions

diff --git a/include/asm-powerpc/rwsem.h b/include/asm-powerpc/rwsem.h
index 0a5b83a3c949..79bae4933b73 100644
--- a/include/asm-powerpc/rwsem.h
+++ b/include/asm-powerpc/rwsem.h
@@ -159,5 +159,10 @@ static inline int rwsem_atomic_update(int delta, struct rw_semaphore *sem)
         return atomic_add_return(delta, (atomic_t *)(&sem->count));
 }
 
+static inline int rwsem_is_locked(struct rw_semaphore *sem)
+{
+        return (sem->count != 0);
+}
+
 #endif  /* __KERNEL__ */
 #endif  /* _ASM_POWERPC_RWSEM_H */