diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-13 19:12:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-13 19:12:23 -0500 |
| commit | 463020ce428e2f00d4f33a383d6f39c7453a6854 (patch) | |
| tree | c82d90c19e83c32b01c9748b4671640a670324e6 /include/asm-mips/system.h | |
| parent | 58a3bb59973e33a428d72fa530a3d1d81feb0e8f (diff) | |
| parent | 431dc8040354db65e4f8d4d4e21ae4fab41f5bc3 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.
[MIPS] Fix uniprocessor Sibyte builds.
[MIPS] Make entry.S a little more readable.
[MIPS] Remove stray instruction from __get_user_asm_ll32.
[MIPS] 32-bit: Fix warning about cast for fetching pointer from userspace.
[MIPS] DECstation: Fix irq handling
[MIPS] signals: make common _BLOCKABLE macro
[MIPS] signal: Move sigframe definition for native O32/N64 into signal.c
[MIPS] signal: Move {restore,setup}_sigcontext prototypes to their user
[MIPS] signal: Fix warnings in o32 compat code.
[MIPS] IP27: Enable N32 support in defconfig.
Revert "[MIPS] Fix warning in get_user when fetching pointer object from userspace."
[MIPS] Don't claim we support dma_declare_coherent_memory - we don't.
[MIPS] Unify dma-{coherent,noncoherent.ip27,ip32}
[MIPS] Improve branch prediction in ll/sc atomic operations.
Diffstat (limited to 'include/asm-mips/system.h')
| -rw-r--r-- | include/asm-mips/system.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index 5e1289c85ed9..597a3743f6a1 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h | |||
| @@ -110,7 +110,10 @@ static inline unsigned long __xchg_u32(volatile int * m, unsigned int val) | |||
| 110 | " move %2, %z4 \n" | 110 | " move %2, %z4 \n" |
| 111 | " .set mips3 \n" | 111 | " .set mips3 \n" |
| 112 | " sc %2, %1 \n" | 112 | " sc %2, %1 \n" |
| 113 | " beqz %2, 1b \n" | 113 | " beqz %2, 2f \n" |
| 114 | " .subsection 2 \n" | ||
| 115 | "2: b 1b \n" | ||
| 116 | " .previous \n" | ||
| 114 | " .set mips0 \n" | 117 | " .set mips0 \n" |
| 115 | : "=&r" (retval), "=m" (*m), "=&r" (dummy) | 118 | : "=&r" (retval), "=m" (*m), "=&r" (dummy) |
| 116 | : "R" (*m), "Jr" (val) | 119 | : "R" (*m), "Jr" (val) |
| @@ -155,7 +158,10 @@ static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val) | |||
| 155 | "1: lld %0, %3 # xchg_u64 \n" | 158 | "1: lld %0, %3 # xchg_u64 \n" |
| 156 | " move %2, %z4 \n" | 159 | " move %2, %z4 \n" |
| 157 | " scd %2, %1 \n" | 160 | " scd %2, %1 \n" |
| 158 | " beqz %2, 1b \n" | 161 | " beqz %2, 2f \n" |
| 162 | " .subsection 2 \n" | ||
| 163 | "2: b 1b \n" | ||
| 164 | " .previous \n" | ||
| 159 | " .set mips0 \n" | 165 | " .set mips0 \n" |
| 160 | : "=&r" (retval), "=m" (*m), "=&r" (dummy) | 166 | : "=&r" (retval), "=m" (*m), "=&r" (dummy) |
| 161 | : "R" (*m), "Jr" (val) | 167 | : "R" (*m), "Jr" (val) |
| @@ -232,8 +238,11 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old, | |||
| 232 | " move $1, %z4 \n" | 238 | " move $1, %z4 \n" |
| 233 | " .set mips3 \n" | 239 | " .set mips3 \n" |
| 234 | " sc $1, %1 \n" | 240 | " sc $1, %1 \n" |
| 235 | " beqz $1, 1b \n" | 241 | " beqz $1, 3f \n" |
| 236 | "2: \n" | 242 | "2: \n" |
| 243 | " .subsection 2 \n" | ||
| 244 | "3: b 1b \n" | ||
| 245 | " .previous \n" | ||
| 237 | " .set pop \n" | 246 | " .set pop \n" |
| 238 | : "=&r" (retval), "=R" (*m) | 247 | : "=&r" (retval), "=R" (*m) |
| 239 | : "R" (*m), "Jr" (old), "Jr" (new) | 248 | : "R" (*m), "Jr" (old), "Jr" (new) |
| @@ -283,8 +292,11 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old, | |||
| 283 | " bne %0, %z3, 2f \n" | 292 | " bne %0, %z3, 2f \n" |
| 284 | " move $1, %z4 \n" | 293 | " move $1, %z4 \n" |
| 285 | " scd $1, %1 \n" | 294 | " scd $1, %1 \n" |
| 286 | " beqz $1, 1b \n" | 295 | " beqz $1, 3f \n" |
| 287 | "2: \n" | 296 | "2: \n" |
| 297 | " .subsection 2 \n" | ||
| 298 | "3: b 1b \n" | ||
| 299 | " .previous \n" | ||
| 288 | " .set pop \n" | 300 | " .set pop \n" |
| 289 | : "=&r" (retval), "=R" (*m) | 301 | : "=&r" (retval), "=R" (*m) |
| 290 | : "R" (*m), "Jr" (old), "Jr" (new) | 302 | : "R" (*m), "Jr" (old), "Jr" (new) |