From c1faab4dd734cb70363e8e63b49320a2b56bf0a6 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Tue, 24 Jun 2008 16:44:39 -0300
Subject: [PATCH] --- yaml --- r: 100057 b: refs/heads/master c:
 0ada3164031162b4e1b7ff6b36ba8cc80ff7fe96 h: refs/heads/master i:   100055:
 f41fb6ae3e893d5d826b1e8f737c72dd7204ef41 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/lib/putuser_64.S    | 8 ++++----
 trunk/include/asm-x86/uaccess_64.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index dde910c20630..6e886c46daa1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 770546b99fb99e71a3aa4181980d42664f9c18bd
+refs/heads/master: 0ada3164031162b4e1b7ff6b36ba8cc80ff7fe96
diff --git a/trunk/arch/x86/lib/putuser_64.S b/trunk/arch/x86/lib/putuser_64.S
index 07028851064c..ce5fcd5d8c16 100644
--- a/trunk/arch/x86/lib/putuser_64.S
+++ b/trunk/arch/x86/lib/putuser_64.S
@@ -37,7 +37,7 @@ ENTRY(__put_user_1)
 	GET_THREAD_INFO(%rbx)
 	cmpq TI_addr_limit(%rbx),%rcx
 	jae bad_put_user
-1:	movb %dl,(%rcx)
+1:	movb %al,(%rcx)
 	xorl %eax,%eax
 	ret
 	CFI_ENDPROC
@@ -51,7 +51,7 @@ ENTRY(__put_user_2)
 	cmpq TI_addr_limit(%rbx),%rcx
 	jae 20f
 	decq %rcx
-2:	movw %dx,(%rcx)
+2:	movw %ax,(%rcx)
 	xorl %eax,%eax
 	ret
 20:	decq %rcx
@@ -67,7 +67,7 @@ ENTRY(__put_user_4)
 	cmpq TI_addr_limit(%rbx),%rcx
 	jae 30f
 	subq $3,%rcx
-3:	movl %edx,(%rcx)
+3:	movl %eax,(%rcx)
 	xorl %eax,%eax
 	ret
 30:	subq $3,%rcx
@@ -83,7 +83,7 @@ ENTRY(__put_user_8)
 	cmpq TI_addr_limit(%rbx),%rcx
 	jae 40f
 	subq $7,%rcx
-4:	movq %rdx,(%rcx)
+4:	movq %rax,(%rcx)
 	xorl %eax,%eax
 	ret
 40:	subq $7,%rcx
diff --git a/trunk/include/asm-x86/uaccess_64.h b/trunk/include/asm-x86/uaccess_64.h
index 21fda9ebee13..f822a36cc1c0 100644
--- a/trunk/include/asm-x86/uaccess_64.h
+++ b/trunk/include/asm-x86/uaccess_64.h
@@ -130,7 +130,7 @@ extern void __put_user_bad(void);
 #define __put_user_x(size, ret, x, ptr)					\
 	asm volatile("call __put_user_" #size				\
 		     :"=a" (ret)					\
-		     :"c" (ptr),"d" (x)					\
+		     :"c" (ptr),"a" (x)					\
 		     :"ebx")
 
 #define put_user(x, ptr)						\