diff options
| author | Dave Johnson <djohnson+linux-mips@sw.starentnetworks.com> | 2007-03-05 20:50:27 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-03-07 00:07:17 +0000 |
| commit | d52c2d5a626a2cb1848fa7063b3ab79e2752dac7 (patch) | |
| tree | de525a4b04f3710d965a662f26d402e872a21247 /include | |
| parent | d0c91ae2bb3df9d7bef279d8f400e0c8ddde0b5e (diff) | |
| download | kernel_samsung_aries-d52c2d5a626a2cb1848fa7063b3ab79e2752dac7.zip kernel_samsung_aries-d52c2d5a626a2cb1848fa7063b3ab79e2752dac7.tar.gz kernel_samsung_aries-d52c2d5a626a2cb1848fa7063b3ab79e2752dac7.tar.bz2 | |
[MIPS] Fix __raw_read_trylock() to allow multiple readers
A deadlock can occur for mixed irq and non-irq rwlock readers if a 2nd
reader attempts to take lock by looping around __raw_read_trylock().
Signed-off-by: Dave Johnson <djohnson+linux-mips@sw.starentnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/spinlock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/spinlock.h b/include/asm-mips/spinlock.h index f1755d2..35e431c 100644 --- a/include/asm-mips/spinlock.h +++ b/include/asm-mips/spinlock.h @@ -287,7 +287,7 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw) " .set noreorder # __raw_read_trylock \n" " li %2, 0 \n" "1: ll %1, %3 \n" - " bnez %1, 2f \n" + " bltz %1, 2f \n" " addu %1, 1 \n" " sc %1, %0 \n" " .set reorder \n" @@ -304,7 +304,7 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw) " .set noreorder # __raw_read_trylock \n" " li %2, 0 \n" "1: ll %1, %3 \n" - " bnez %1, 2f \n" + " bltz %1, 2f \n" " addu %1, 1 \n" " sc %1, %0 \n" " beqz %1, 1b \n" |