From 8de0fbf4ebcced84493c86e145b0549f41372e3a Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Fri, 24 Mar 2006 21:22:02 -0700 Subject: [PATCH] --- yaml --- r: 24823 b: refs/heads/master c: bc8846c522264d2522b0082321ec8c2051a4536f h: refs/heads/master i: 24821: d17878a38980f3f61f1f8338a4baaf2b86a40b5e 24819: a7a40668811dae3d560cb64fb2ea59c004e9decd 24815: b6573a19f363a0dd4d06ac0cc066bfd92f669b6d v: v3 --- [refs] | 2 +- trunk/include/asm-parisc/spinlock.h | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aac1f6726320..87c8028f3b23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 102c8c76f787add0790406d5c47e03cb6f8765c2 +refs/heads/master: bc8846c522264d2522b0082321ec8c2051a4536f diff --git a/trunk/include/asm-parisc/spinlock.h b/trunk/include/asm-parisc/spinlock.h index 16c2ac075fc5..a93960e232cf 100644 --- a/trunk/include/asm-parisc/spinlock.h +++ b/trunk/include/asm-parisc/spinlock.h @@ -134,14 +134,22 @@ static __inline__ int __raw_write_trylock(raw_rwlock_t *rw) return 1; } -static __inline__ int __raw_is_read_locked(raw_rwlock_t *rw) +/* + * read_can_lock - would read_trylock() succeed? + * @lock: the rwlock in question. + */ +static __inline__ int __raw_read_can_lock(raw_rwlock_t *rw) { - return rw->counter > 0; + return rw->counter >= 0; } -static __inline__ int __raw_is_write_locked(raw_rwlock_t *rw) +/* + * write_can_lock - would write_trylock() succeed? + * @lock: the rwlock in question. + */ +static __inline__ int __raw_write_can_lock(raw_rwlock_t *rw) { - return rw->counter < 0; + return !rw->counter; } #endif /* __ASM_SPINLOCK_H */