diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 09:25:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 09:25:22 -0800 |
| commit | 78cd9e04e0acea4f622e84ca0c760c7eae0c6854 (patch) | |
| tree | 6df4f07bfa77f8115e4250a14be76c04a2b5dc3e | |
| parent | ec7e15d6486e9d1da1c2f344b670b8388ba7019b (diff) | |
| parent | 6e57a3a89785692bd8d012d80f5ee210ab8e0b68 (diff) | |
| download | op-kernel-dev-78cd9e04e0acea4f622e84ca0c760c7eae0c6854.zip op-kernel-dev-78cd9e04e0acea4f622e84ca0c760c7eae0c6854.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Implement futex_atomic_cmpxchg_inatomic().
| -rw-r--r-- | include/asm-sparc64/futex.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h index cd340a2..dee4020 100644 --- a/include/asm-sparc64/futex.h +++ b/include/asm-sparc64/futex.h @@ -84,9 +84,27 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr) } static inline int -futex_atomic_cmpxchg_inuser(int __user *uaddr, int oldval, int newval) +futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) { - return -ENOSYS; + __asm__ __volatile__( + "\n1: lduwa [%2] %%asi, %0\n" + "2: casa [%2] %%asi, %0, %1\n" + "3:\n" + " .section .fixup,#alloc,#execinstr\n" + " .align 4\n" + "4: ba 3b\n" + " mov %3, %0\n" + " .previous\n" + " .section __ex_table,\"a\"\n" + " .align 4\n" + " .word 1b, 4b\n" + " .word 2b, 4b\n" + " .previous\n" + : "=&r" (oldval) + : "r" (newval), "r" (uaddr), "i" (-EFAULT) + : "memory"); + + return oldval; } #endif /* !(_SPARC64_FUTEX_H) */ |
