Merge branch 'master'

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / futex.h

diff --git a/include/asm-powerpc/futex.h b/include/asm-powerpc/futex.h
index 80ed9854e42bd12720c0713f166c0ba8eb97fa0a..f1b3c00bc1ce8d8ca0254f57cc76ac6d648820ae 100644 (file)
--- a/include/asm-powerpc/futex.h
+++ b/include/asm-powerpc/futex.h
@@ -82,7 +82,7 @@ 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;
 }