diff options
Diffstat (limited to 'arch/sparc64/kernel/semaphore.c')
| -rw-r--r-- | arch/sparc64/kernel/semaphore.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/semaphore.c b/arch/sparc64/kernel/semaphore.c index 63496c43fe17..a809e63f03ef 100644 --- a/arch/sparc64/kernel/semaphore.c +++ b/arch/sparc64/kernel/semaphore.c | |||
| @@ -32,8 +32,9 @@ static __inline__ int __sem_update_count(struct semaphore *sem, int incr) | |||
| 32 | " add %1, %4, %1\n" | 32 | " add %1, %4, %1\n" |
| 33 | " cas [%3], %0, %1\n" | 33 | " cas [%3], %0, %1\n" |
| 34 | " cmp %0, %1\n" | 34 | " cmp %0, %1\n" |
| 35 | " membar #StoreLoad | #StoreStore\n" | ||
| 35 | " bne,pn %%icc, 1b\n" | 36 | " bne,pn %%icc, 1b\n" |
| 36 | " membar #StoreLoad | #StoreStore\n" | 37 | " nop\n" |
| 37 | : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) | 38 | : "=&r" (old_count), "=&r" (tmp), "=m" (sem->count) |
| 38 | : "r" (&sem->count), "r" (incr), "m" (sem->count) | 39 | : "r" (&sem->count), "r" (incr), "m" (sem->count) |
| 39 | : "cc"); | 40 | : "cc"); |
| @@ -71,8 +72,9 @@ void up(struct semaphore *sem) | |||
| 71 | " cmp %%g1, %%g7\n" | 72 | " cmp %%g1, %%g7\n" |
| 72 | " bne,pn %%icc, 1b\n" | 73 | " bne,pn %%icc, 1b\n" |
| 73 | " addcc %%g7, 1, %%g0\n" | 74 | " addcc %%g7, 1, %%g0\n" |
| 75 | " membar #StoreLoad | #StoreStore\n" | ||
| 74 | " ble,pn %%icc, 3f\n" | 76 | " ble,pn %%icc, 3f\n" |
| 75 | " membar #StoreLoad | #StoreStore\n" | 77 | " nop\n" |
| 76 | "2:\n" | 78 | "2:\n" |
| 77 | " .subsection 2\n" | 79 | " .subsection 2\n" |
| 78 | "3: mov %0, %%g1\n" | 80 | "3: mov %0, %%g1\n" |
| @@ -128,8 +130,9 @@ void __sched down(struct semaphore *sem) | |||
| 128 | " cmp %%g1, %%g7\n" | 130 | " cmp %%g1, %%g7\n" |
| 129 | " bne,pn %%icc, 1b\n" | 131 | " bne,pn %%icc, 1b\n" |
| 130 | " cmp %%g7, 1\n" | 132 | " cmp %%g7, 1\n" |
| 133 | " membar #StoreLoad | #StoreStore\n" | ||
| 131 | " bl,pn %%icc, 3f\n" | 134 | " bl,pn %%icc, 3f\n" |
| 132 | " membar #StoreLoad | #StoreStore\n" | 135 | " nop\n" |
| 133 | "2:\n" | 136 | "2:\n" |
| 134 | " .subsection 2\n" | 137 | " .subsection 2\n" |
| 135 | "3: mov %0, %%g1\n" | 138 | "3: mov %0, %%g1\n" |
| @@ -233,8 +236,9 @@ int __sched down_interruptible(struct semaphore *sem) | |||
| 233 | " cmp %%g1, %%g7\n" | 236 | " cmp %%g1, %%g7\n" |
| 234 | " bne,pn %%icc, 1b\n" | 237 | " bne,pn %%icc, 1b\n" |
| 235 | " cmp %%g7, 1\n" | 238 | " cmp %%g7, 1\n" |
| 239 | " membar #StoreLoad | #StoreStore\n" | ||
| 236 | " bl,pn %%icc, 3f\n" | 240 | " bl,pn %%icc, 3f\n" |
| 237 | " membar #StoreLoad | #StoreStore\n" | 241 | " nop\n" |
| 238 | "2:\n" | 242 | "2:\n" |
| 239 | " .subsection 2\n" | 243 | " .subsection 2\n" |
| 240 | "3: mov %2, %%g1\n" | 244 | "3: mov %2, %%g1\n" |