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().

+20 -2
+20 -2
include/asm-sparc64/futex.h
··· 84 84 } 85 85 86 86 static inline int 87 - futex_atomic_cmpxchg_inuser(int __user *uaddr, int oldval, int newval) 87 + futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) 88 88 { 89 - return -ENOSYS; 89 + __asm__ __volatile__( 90 + "\n1: lduwa [%2] %%asi, %0\n" 91 + "2: casa [%2] %%asi, %0, %1\n" 92 + "3:\n" 93 + " .section .fixup,#alloc,#execinstr\n" 94 + " .align 4\n" 95 + "4: ba 3b\n" 96 + " mov %3, %0\n" 97 + " .previous\n" 98 + " .section __ex_table,\"a\"\n" 99 + " .align 4\n" 100 + " .word 1b, 4b\n" 101 + " .word 2b, 4b\n" 102 + " .previous\n" 103 + : "=&r" (oldval) 104 + : "r" (newval), "r" (uaddr), "i" (-EFAULT) 105 + : "memory"); 106 + 107 + return oldval; 90 108 } 91 109 92 110 #endif /* !(_SPARC64_FUTEX_H) */