Pull bugzilla-7570 into release branch

[powerpc.git] / include / asm-frv / futex.h

diff --git a/include/asm-frv/futex.h b/include/asm-frv/futex.h
index 9a0e902..08b3d1d 100644 (file)
--- a/include/asm-frv/futex.h
+++ b/include/asm-frv/futex.h
@@ -10,7 +10,7 @@
 extern 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;
 }