diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-12-03 14:01:19 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-12-14 17:55:32 -0500 |
| commit | fb3a6bbc912b12347614e5742c7c61416cdb0ca0 (patch) | |
| tree | f9dbf8dab23cea6f033a58672ba16abf2ae09ebd /arch/cris | |
| parent | 0199c4e68d1f02894bdefe4b5d9e9ee4aedd8d62 (diff) | |
locking: Convert raw_rwlock to arch_rwlock
Not strictly necessary for -rt as -rt does not have non sleeping
rwlocks, but it's odd to not have a consistent naming convention.
No functional change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: linux-arch@vger.kernel.org
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/include/arch-v32/arch/spinlock.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/cris/include/arch-v32/arch/spinlock.h b/arch/cris/include/arch-v32/arch/spinlock.h index a2e8a394d555..1d7d3a8046cb 100644 --- a/arch/cris/include/arch-v32/arch/spinlock.h +++ b/arch/cris/include/arch-v32/arch/spinlock.h | |||
| @@ -56,17 +56,17 @@ arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags) | |||
| 56 | * | 56 | * |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | static inline int __raw_read_can_lock(raw_rwlock_t *x) | 59 | static inline int __raw_read_can_lock(arch_rwlock_t *x) |
| 60 | { | 60 | { |
| 61 | return (int)(x)->lock > 0; | 61 | return (int)(x)->lock > 0; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | static inline int __raw_write_can_lock(raw_rwlock_t *x) | 64 | static inline int __raw_write_can_lock(arch_rwlock_t *x) |
| 65 | { | 65 | { |
| 66 | return (x)->lock == RW_LOCK_BIAS; | 66 | return (x)->lock == RW_LOCK_BIAS; |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | static inline void __raw_read_lock(raw_rwlock_t *rw) | 69 | static inline void __raw_read_lock(arch_rwlock_t *rw) |
| 70 | { | 70 | { |
| 71 | arch_spin_lock(&rw->slock); | 71 | arch_spin_lock(&rw->slock); |
| 72 | while (rw->lock == 0); | 72 | while (rw->lock == 0); |
| @@ -74,7 +74,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw) | |||
| 74 | arch_spin_unlock(&rw->slock); | 74 | arch_spin_unlock(&rw->slock); |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | static inline void __raw_write_lock(raw_rwlock_t *rw) | 77 | static inline void __raw_write_lock(arch_rwlock_t *rw) |
| 78 | { | 78 | { |
| 79 | arch_spin_lock(&rw->slock); | 79 | arch_spin_lock(&rw->slock); |
| 80 | while (rw->lock != RW_LOCK_BIAS); | 80 | while (rw->lock != RW_LOCK_BIAS); |
| @@ -82,14 +82,14 @@ static inline void __raw_write_lock(raw_rwlock_t *rw) | |||
| 82 | arch_spin_unlock(&rw->slock); | 82 | arch_spin_unlock(&rw->slock); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | static inline void __raw_read_unlock(raw_rwlock_t *rw) | 85 | static inline void __raw_read_unlock(arch_rwlock_t *rw) |
| 86 | { | 86 | { |
| 87 | arch_spin_lock(&rw->slock); | 87 | arch_spin_lock(&rw->slock); |
| 88 | rw->lock++; | 88 | rw->lock++; |
| 89 | arch_spin_unlock(&rw->slock); | 89 | arch_spin_unlock(&rw->slock); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | static inline void __raw_write_unlock(raw_rwlock_t *rw) | 92 | static inline void __raw_write_unlock(arch_rwlock_t *rw) |
| 93 | { | 93 | { |
| 94 | arch_spin_lock(&rw->slock); | 94 | arch_spin_lock(&rw->slock); |
| 95 | while (rw->lock != RW_LOCK_BIAS); | 95 | while (rw->lock != RW_LOCK_BIAS); |
| @@ -97,7 +97,7 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw) | |||
| 97 | arch_spin_unlock(&rw->slock); | 97 | arch_spin_unlock(&rw->slock); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | static inline int __raw_read_trylock(raw_rwlock_t *rw) | 100 | static inline int __raw_read_trylock(arch_rwlock_t *rw) |
| 101 | { | 101 | { |
| 102 | int ret = 0; | 102 | int ret = 0; |
| 103 | arch_spin_lock(&rw->slock); | 103 | arch_spin_lock(&rw->slock); |
| @@ -109,7 +109,7 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw) | |||
| 109 | return ret; | 109 | return ret; |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | static inline int __raw_write_trylock(raw_rwlock_t *rw) | 112 | static inline int __raw_write_trylock(arch_rwlock_t *rw) |
| 113 | { | 113 | { |
| 114 | int ret = 0; | 114 | int ret = 0; |
| 115 | arch_spin_lock(&rw->slock); | 115 | arch_spin_lock(&rw->slock); |