Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e86df27 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Fix ARM rwlock implementations 



fb1c8f93 broke the ARM rwlock code since
it only partially updated the rwlock implementation.  Properly update it.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e831556f

include/asm-arm/spinlock.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock) 
 */

 */

#define rwlock_is_locked(x)	(*((volatile unsigned int *)(x)) != 0)

#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;

	unsigned long tmp;
@@ -97,7 +97,7 @@ static inline void __raw_write_lock(rwlock_t *rw) 
	smp_mb();

	smp_mb();

}

}





static inline int __raw_write_trylock(rwlock_t *rw)

static inline int __raw_write_trylock(raw_rwlock_t *rw)

{

{

	unsigned long tmp;

	unsigned long tmp;
@@ -157,7 +157,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw) 
	smp_mb();

	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;

	unsigned long tmp, tmp2;