diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-02 10:09:31 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-02 10:09:31 -0500 |
commit | 7e86df273292b3a88c14b9aed1006cddac2b4c23 (patch) | |
tree | b58f353e501c2c18d5bff5a7f07a94316d143713 /include/asm-arm/spinlock.h | |
parent | e831556fb6f81142f9b51d1a05953d8046c27467 (diff) |
[ARM] Fix ARM rwlock implementations
fb1c8f93d869b34cacb8b8932e2b83d96a19d720 broke the ARM rwlock code since
it only partially updated the rwlock implementation. Properly update it.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/spinlock.h')
-rw-r--r-- | include/asm-arm/spinlock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/spinlock.h b/include/asm-arm/spinlock.h index cb4906b45555..6ed4f916b166 100644 --- a/include/asm-arm/spinlock.h +++ b/include/asm-arm/spinlock.h | |||
@@ -80,7 +80,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock) | |||
80 | */ | 80 | */ |
81 | #define rwlock_is_locked(x) (*((volatile unsigned int *)(x)) != 0) | 81 | #define rwlock_is_locked(x) (*((volatile unsigned int *)(x)) != 0) |
82 | 82 | ||
83 | static inline void __raw_write_lock(rwlock_t *rw) | 83 | static inline void __raw_write_lock(raw_rwlock_t *rw) |
84 | { | 84 | { |
85 | unsigned long tmp; | 85 | unsigned long tmp; |
86 | 86 | ||
@@ -97,7 +97,7 @@ static inline void __raw_write_lock(rwlock_t *rw) | |||
97 | smp_mb(); | 97 | smp_mb(); |
98 | } | 98 | } |
99 | 99 | ||
100 | static inline int __raw_write_trylock(rwlock_t *rw) | 100 | static inline int __raw_write_trylock(raw_rwlock_t *rw) |
101 | { | 101 | { |
102 | unsigned long tmp; | 102 | unsigned long tmp; |
103 | 103 | ||
@@ -157,7 +157,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw) | |||
157 | smp_mb(); | 157 | smp_mb(); |
158 | } | 158 | } |
159 | 159 | ||
160 | static inline void __raw_read_unlock(rwlock_t *rw) | 160 | static inline void __raw_read_unlock(raw_rwlock_t *rw) |
161 | { | 161 | { |
162 | unsigned long tmp, tmp2; | 162 | unsigned long tmp, tmp2; |
163 | 163 | ||