X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fx86%2Flib%2Fmemcpy_64.S;h=2ec0b0abbfaa876fb242b71061b70cdb7dc9db20;hb=2f4fcb3eafd7e5d3e12f7e74093d2e8c43ef5eb6;hp=cbb8ee5830ff134f131533fd91ea8be35a853dba;hpb=ed7d6bc23b6dd8f5272431ce930c84d1e537be49;p=deliverable%2Flinux.git

diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
index cbb8ee5830ff..2ec0b0abbfaa 100644
--- a/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
@@ -1,6 +1,7 @@
 /* Copyright 2002 Andi Kleen */
 
 #include <linux/linkage.h>
+#include <asm/errno.h>
 #include <asm/cpufeatures.h>
 #include <asm/alternative-asm.h>
 
@@ -268,16 +269,16 @@ ENTRY(memcpy_mcsafe)
 	decl %ecx
 	jnz .L_copy_trailing_bytes
 
-	/* Copy successful. Return true */
+	/* Copy successful. Return zero */
 .L_done_memcpy_trap:
 	xorq %rax, %rax
 	ret
 ENDPROC(memcpy_mcsafe)
 
 	.section .fixup, "ax"
-	/* Return false for any failure */
+	/* Return -EFAULT for any failure */
 .L_memcpy_mcsafe_fail:
-	mov	$1, %rax
+	mov	$-EFAULT, %rax
 	ret
 
 	.previous