diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-12-03 14:08:46 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-12-14 17:55:32 -0500 |
| commit | e5931943d02bf751b1ec849c0d2ade23d76a8d41 (patch) | |
| tree | 119fe3bc583d0d043d97cb9edd98bad52692a546 /lib | |
| parent | fb3a6bbc912b12347614e5742c7c61416cdb0ca0 (diff) | |
locking: Convert raw_rwlock functions to arch_rwlock
Name space cleanup for rwlock functions. 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 'lib')
| -rw-r--r-- | lib/spinlock_debug.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index 3f72f10d9cb..0cea0bf6114 100644 --- a/lib/spinlock_debug.c +++ b/lib/spinlock_debug.c | |||
| @@ -176,7 +176,7 @@ static void __read_lock_debug(rwlock_t *lock) | |||
| 176 | 176 | ||
| 177 | for (;;) { | 177 | for (;;) { |
| 178 | for (i = 0; i < loops; i++) { | 178 | for (i = 0; i < loops; i++) { |
| 179 | if (__raw_read_trylock(&lock->raw_lock)) | 179 | if (arch_read_trylock(&lock->raw_lock)) |
| 180 | return; | 180 | return; |
| 181 | __delay(1); | 181 | __delay(1); |
| 182 | } | 182 | } |
| @@ -196,12 +196,12 @@ static void __read_lock_debug(rwlock_t *lock) | |||
| 196 | void _raw_read_lock(rwlock_t *lock) | 196 | void _raw_read_lock(rwlock_t *lock) |
| 197 | { | 197 | { |
| 198 | RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic"); | 198 | RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic"); |
| 199 | __raw_read_lock(&lock->raw_lock); | 199 | arch_read_lock(&lock->raw_lock); |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | int _raw_read_trylock(rwlock_t *lock) | 202 | int _raw_read_trylock(rwlock_t *lock) |
| 203 | { | 203 | { |
| 204 | int ret = __raw_read_trylock(&lock->raw_lock); | 204 | int ret = arch_read_trylock(&lock->raw_lock); |
| 205 | 205 | ||
| 206 | #ifndef CONFIG_SMP | 206 | #ifndef CONFIG_SMP |
| 207 | /* | 207 | /* |
| @@ -215,7 +215,7 @@ int _raw_read_trylock(rwlock_t *lock) | |||
| 215 | void _raw_read_unlock(rwlock_t *lock) | 215 | void _raw_read_unlock(rwlock_t *lock) |
| 216 | { | 216 | { |
| 217 | RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic"); | 217 | RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic"); |
| 218 | __raw_read_unlock(&lock->raw_lock); | 218 | arch_read_unlock(&lock->raw_lock); |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | static inline void debug_write_lock_before(rwlock_t *lock) | 221 | static inline void debug_write_lock_before(rwlock_t *lock) |
| @@ -251,7 +251,7 @@ static void __write_lock_debug(rwlock_t *lock) | |||
| 251 | 251 | ||
| 252 | for (;;) { | 252 | for (;;) { |
| 253 | for (i = 0; i < loops; i++) { | 253 | for (i = 0; i < loops; i++) { |
| 254 | if (__raw_write_trylock(&lock->raw_lock)) | 254 | if (arch_write_trylock(&lock->raw_lock)) |
| 255 | return; | 255 | return; |
| 256 | __delay(1); | 256 | __delay(1); |
| 257 | } | 257 | } |
| @@ -271,13 +271,13 @@ static void __write_lock_debug(rwlock_t *lock) | |||
| 271 | void _raw_write_lock(rwlock_t *lock) | 271 | void _raw_write_lock(rwlock_t *lock) |
| 272 | { | 272 | { |
| 273 | debug_write_lock_before(lock); | 273 | debug_write_lock_before(lock); |
| 274 | __raw_write_lock(&lock->raw_lock); | 274 | arch_write_lock(&lock->raw_lock); |
| 275 | debug_write_lock_after(lock); | 275 | debug_write_lock_after(lock); |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | int _raw_write_trylock(rwlock_t *lock) | 278 | int _raw_write_trylock(rwlock_t *lock) |
| 279 | { | 279 | { |
| 280 | int ret = __raw_write_trylock(&lock->raw_lock); | 280 | int ret = arch_write_trylock(&lock->raw_lock); |
| 281 | 281 | ||
| 282 | if (ret) | 282 | if (ret) |
| 283 | debug_write_lock_after(lock); | 283 | debug_write_lock_after(lock); |
| @@ -293,5 +293,5 @@ int _raw_write_trylock(rwlock_t *lock) | |||
| 293 | void _raw_write_unlock(rwlock_t *lock) | 293 | void _raw_write_unlock(rwlock_t *lock) |
| 294 | { | 294 | { |
| 295 | debug_write_unlock(lock); | 295 | debug_write_unlock(lock); |
| 296 | __raw_write_unlock(&lock->raw_lock); | 296 | arch_write_unlock(&lock->raw_lock); |
| 297 | } | 297 | } |
