diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
| commit | fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 (patch) | |
| tree | cba2597077cf33d122f8d771bf84618cc5374cf6 /arch/mips/kernel/semaphore.c | |
| parent | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
| download | op-kernel-dev-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.zip op-kernel-dev-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.gz | |
Merge branch 'upstream'
Diffstat (limited to 'arch/mips/kernel/semaphore.c')
| -rw-r--r-- | arch/mips/kernel/semaphore.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/mips/kernel/semaphore.c b/arch/mips/kernel/semaphore.c index 9c40fe5..1265358 100644 --- a/arch/mips/kernel/semaphore.c +++ b/arch/mips/kernel/semaphore.c @@ -42,24 +42,28 @@ static inline int __sem_update_count(struct semaphore *sem, int incr) if (cpu_has_llsc && R10000_LLSC_WAR) { __asm__ __volatile__( - "1: ll %0, %2 \n" + " .set mips3 \n" + "1: ll %0, %2 # __sem_update_count \n" " sra %1, %0, 31 \n" " not %1 \n" " and %1, %0, %1 \n" - " add %1, %1, %3 \n" + " addu %1, %1, %3 \n" " sc %1, %2 \n" " beqzl %1, 1b \n" + " .set mips0 \n" : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) : "r" (incr), "m" (sem->count)); } else if (cpu_has_llsc) { __asm__ __volatile__( - "1: ll %0, %2 \n" + " .set mips3 \n" + "1: ll %0, %2 # __sem_update_count \n" " sra %1, %0, 31 \n" " not %1 \n" " and %1, %0, %1 \n" - " add %1, %1, %3 \n" + " addu %1, %1, %3 \n" " sc %1, %2 \n" " beqz %1, 1b \n" + " .set mips0 \n" : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) : "r" (incr), "m" (sem->count)); } else { |
