Skip to content

Commit

Permalink
[ARM] Fix ARM __raw_read_trylock() implementation
Browse files Browse the repository at this point in the history
Matthew Wilcox pointed out that the generic implementation
of this is unfit for use.  Here's an ARM optimised version
instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Aug 31, 2006
1 parent 0355b3e commit 8e34703
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion include/asm-arm/spinlock.h
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,21 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
: "cc");
}

#define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
static inline int __raw_read_trylock(raw_rwlock_t *rw)
{
unsigned long tmp tmp2 = 1;

__asm__ __volatile__(
"1: ldrex %0, [%2]\n"
" adds %0, %0, #1\n"
" strexpl %1, %0, [%2]\n"
: "=&r" (tmp), "+r" (tmp2)
: "r" (&rw->lock)
: "cc");

smp_mb();
return tmp2 == 0;
}

/* read_can_lock - would read_trylock() succeed? */
#define __raw_read_can_lock(x) ((x)->lock < 0x80000000)
Expand Down

0 comments on commit 8e34703

Please sign in to comment.