From 2ad998979b162961e6cc5c3486737bf3a3b7c8a2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 2 Nov 2005 15:09:31 +0000 Subject: [PATCH] --- yaml --- r: 12173 b: refs/heads/master c: 7e86df273292b3a88c14b9aed1006cddac2b4c23 h: refs/heads/master i: 12171: a1cae74894103c137adbbb13a90dbda9832e5f71 v: v3 --- [refs] | 2 +- trunk/include/asm-arm/spinlock.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7f2a9819473f..063d137be884 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e831556fb6f81142f9b51d1a05953d8046c27467 +refs/heads/master: 7e86df273292b3a88c14b9aed1006cddac2b4c23 diff --git a/trunk/include/asm-arm/spinlock.h b/trunk/include/asm-arm/spinlock.h index cb4906b45555..6ed4f916b166 100644 --- a/trunk/include/asm-arm/spinlock.h +++ b/trunk/include/asm-arm/spinlock.h @@ -80,7 +80,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock) */ #define rwlock_is_locked(x) (*((volatile unsigned int *)(x)) != 0) -static inline void __raw_write_lock(rwlock_t *rw) +static inline void __raw_write_lock(raw_rwlock_t *rw) { unsigned long tmp; @@ -97,7 +97,7 @@ static inline void __raw_write_lock(rwlock_t *rw) smp_mb(); } -static inline int __raw_write_trylock(rwlock_t *rw) +static inline int __raw_write_trylock(raw_rwlock_t *rw) { unsigned long tmp; @@ -157,7 +157,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw) smp_mb(); } -static inline void __raw_read_unlock(rwlock_t *rw) +static inline void __raw_read_unlock(raw_rwlock_t *rw) { unsigned long tmp, tmp2;