X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=mm%2Fmaccess.c;h=78f9274dd49d06f11f87beae9520a0e1267dc3ff;hb=8f182270dfec432e93fae14f9208a6b9af01009f;hp=d159b1c96e484d902f6edb34ebb5a83a3977bd57;hpb=3b3b3bd97788e1f574c71f865d8465b00a6b8708;p=deliverable%2Flinux.git

diff --git a/mm/maccess.c b/mm/maccess.c
index d159b1c96e48..78f9274dd49d 100644
--- a/mm/maccess.c
+++ b/mm/maccess.c
@@ -96,8 +96,7 @@ long strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)
 	pagefault_disable();
 
 	do {
-		ret = __copy_from_user_inatomic(dst++,
-						(const void __user __force *)src++, 1);
+		ret = __get_user(*dst++, (const char __user __force *)src++);
 	} while (dst[-1] && ret == 0 && src - unsafe_addr < count);
 
 	dst[-1] = '\0';