diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
| commit | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch) | |
| tree | 318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /arch/mips/kernel/semaphore.c | |
| parent | 955c5038823748e529a49f0e33ab635d92843500 (diff) | |
| parent | 09af7b443c257460d45cb6c1896d29f173fef35b (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
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 9c40fe5a8e..1265358cdc 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) | |||
| 42 | 42 | ||
| 43 | if (cpu_has_llsc && R10000_LLSC_WAR) { | 43 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
| 44 | __asm__ __volatile__( | 44 | __asm__ __volatile__( |
| 45 | "1: ll %0, %2 \n" | 45 | " .set mips3 \n" |
| 46 | "1: ll %0, %2 # __sem_update_count \n" | ||
| 46 | " sra %1, %0, 31 \n" | 47 | " sra %1, %0, 31 \n" |
| 47 | " not %1 \n" | 48 | " not %1 \n" |
| 48 | " and %1, %0, %1 \n" | 49 | " and %1, %0, %1 \n" |
| 49 | " add %1, %1, %3 \n" | 50 | " addu %1, %1, %3 \n" |
| 50 | " sc %1, %2 \n" | 51 | " sc %1, %2 \n" |
| 51 | " beqzl %1, 1b \n" | 52 | " beqzl %1, 1b \n" |
| 53 | " .set mips0 \n" | ||
| 52 | : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) | 54 | : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) |
| 53 | : "r" (incr), "m" (sem->count)); | 55 | : "r" (incr), "m" (sem->count)); |
| 54 | } else if (cpu_has_llsc) { | 56 | } else if (cpu_has_llsc) { |
| 55 | __asm__ __volatile__( | 57 | __asm__ __volatile__( |
| 56 | "1: ll %0, %2 \n" | 58 | " .set mips3 \n" |
| 59 | "1: ll %0, %2 # __sem_update_count \n" | ||
| 57 | " sra %1, %0, 31 \n" | 60 | " sra %1, %0, 31 \n" |
| 58 | " not %1 \n" | 61 | " not %1 \n" |
| 59 | " and %1, %0, %1 \n" | 62 | " and %1, %0, %1 \n" |
| 60 | " add %1, %1, %3 \n" | 63 | " addu %1, %1, %3 \n" |
| 61 | " sc %1, %2 \n" | 64 | " sc %1, %2 \n" |
| 62 | " beqz %1, 1b \n" | 65 | " beqz %1, 1b \n" |
| 66 | " .set mips0 \n" | ||
| 63 | : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) | 67 | : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) |
| 64 | : "r" (incr), "m" (sem->count)); | 68 | : "r" (incr), "m" (sem->count)); |
| 65 | } else { | 69 | } else { |