diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 00:46:46 -0400 |
| commit | 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (patch) | |
| tree | 575f59b6a0918b11f7c763aecf0c3e70478460d2 /include/asm-sparc64/rwsem.h | |
| parent | ad3fee560bc508008b3b2cf6358105c4c7081921 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-sparc64/rwsem.h')
| -rw-r--r-- | include/asm-sparc64/rwsem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-sparc64/rwsem.h b/include/asm-sparc64/rwsem.h index bf2ae90ed3df..a1cc94f95984 100644 --- a/include/asm-sparc64/rwsem.h +++ b/include/asm-sparc64/rwsem.h | |||
| @@ -55,8 +55,9 @@ static __inline__ int rwsem_atomic_update(int delta, struct rw_semaphore *sem) | |||
| 55 | "add %%g1, %1, %%g7\n\t" | 55 | "add %%g1, %1, %%g7\n\t" |
| 56 | "cas [%2], %%g1, %%g7\n\t" | 56 | "cas [%2], %%g1, %%g7\n\t" |
| 57 | "cmp %%g1, %%g7\n\t" | 57 | "cmp %%g1, %%g7\n\t" |
| 58 | "membar #StoreLoad | #StoreStore\n\t" | ||
| 58 | "bne,pn %%icc, 1b\n\t" | 59 | "bne,pn %%icc, 1b\n\t" |
| 59 | " membar #StoreLoad | #StoreStore\n\t" | 60 | " nop\n\t" |
| 60 | "mov %%g7, %0\n\t" | 61 | "mov %%g7, %0\n\t" |
| 61 | : "=&r" (tmp) | 62 | : "=&r" (tmp) |
| 62 | : "0" (tmp), "r" (sem) | 63 | : "0" (tmp), "r" (sem) |