diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /include/asm-ppc/semaphore.h | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'include/asm-ppc/semaphore.h')
| -rw-r--r-- | include/asm-ppc/semaphore.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ppc/semaphore.h b/include/asm-ppc/semaphore.h index a4dfa0312..f6a2a59f2 100644 --- a/include/asm-ppc/semaphore.h +++ b/include/asm-ppc/semaphore.h @@ -44,13 +44,13 @@ static inline int waking_non_zero(struct semaphore *sem) __asm__ __volatile__( "1: lwarx %1,0,%2\n" " cmpwi 0,%1,0\n" - " addi %1,%1,-1\n" + " addic %1,%1,-1\n" " ble- 2f\n" " stwcx. %1,0,%2\n" " bne- 1b\n" - " mr %0,%1\n" + " li %0,1\n" "2:" - : "=r" (ret), "=r" (tmp) + : "=r" (ret), "=&r" (tmp) : "r" (&sem->waking), "0" (0) : "cr0", "memory"); |