linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-parisc / spinlock.h

diff --git a/include/asm-parisc/spinlock.h b/include/asm-parisc/spinlock.h
index a93960e..16c2ac0 100644 (file)
--- a/include/asm-parisc/spinlock.h
+++ b/include/asm-parisc/spinlock.h
@@ -134,22 +134,14 @@ static  __inline__ int __raw_write_trylock(raw_rwlock_t *rw)
        return 1;
 }
 
-/*
- * read_can_lock - would read_trylock() succeed?
- * @lock: the rwlock in question.
- */
-static __inline__ int __raw_read_can_lock(raw_rwlock_t *rw)
+static __inline__ int __raw_is_read_locked(raw_rwlock_t *rw)
 {
-       return rw->counter >= 0;
+       return rw->counter > 0;
 }
 
-/*
- * write_can_lock - would write_trylock() succeed?
- * @lock: the rwlock in question.
- */
-static __inline__ int __raw_write_can_lock(raw_rwlock_t *rw)
+static __inline__ int __raw_is_write_locked(raw_rwlock_t *rw)
 {
-       return !rw->counter;
+       return rw->counter < 0;
 }
 
 #endif /* __ASM_SPINLOCK_H */