Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-block.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index c20f06f38ef35a4776a61c3579a6de813e466ce0..ee25f5ba4aca13f8a05a9e6c3a4c5a2aff768131 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -729,7 +729,7 @@ static int get_futex_value_locked(u32 *dest, u32 __user *from)
        int ret;
 
        pagefault_disable();
-       ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
+       ret = __get_user(*dest, from);
        pagefault_enable();
 
        return ret ? -EFAULT : 0;