Manual merge with Linus.

[linux-2.6] / include / asm-generic / futex.h

diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 514bd401cd7e07fe50bc42a28f6c257ce2b0f973..df893c160318a6ac84ae076bc7ac5b98c33722ac 100644 (file)
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -50,7 +50,7 @@ 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;
 }