From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 2 Nov 2005 15:09:31 +0000 (+0000)
Subject: [ARM] Fix ARM rwlock implementations
X-Git-Tag: v2.6.15-rc1~450^2~4^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7e86df273292b3a88c14b9aed1006cddac2b4c23;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/include/asm-arm/spinlock.h b/include/asm-arm/spinlock.h
index cb4906b4555..6ed4f916b16 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)
  */
 #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;