aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-06-24 15:44:39 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-09 03:14:08 -0400
commit0ada3164031162b4e1b7ff6b36ba8cc80ff7fe96 (patch)
tree630d8811b1291a37dd1c55786a05997f24c05430
parent770546b99fb99e71a3aa4181980d42664f9c18bd (diff)
x86: pass argument to putuser_64 functions in ax register.
This is consistent with i386 usage. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/lib/putuser_64.S8
-rw-r--r--include/asm-x86/uaccess_64.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/lib/putuser_64.S b/arch/x86/lib/putuser_64.S
index 07028851064c..ce5fcd5d8c16 100644
--- a/arch/x86/lib/putuser_64.S
+++ b/arch/x86/lib/putuser_64.S
@@ -37,7 +37,7 @@ ENTRY(__put_user_1)
37 GET_THREAD_INFO(%rbx) 37 GET_THREAD_INFO(%rbx)
38 cmpq TI_addr_limit(%rbx),%rcx 38 cmpq TI_addr_limit(%rbx),%rcx
39 jae bad_put_user 39 jae bad_put_user
401: movb %dl,(%rcx) 401: movb %al,(%rcx)
41 xorl %eax,%eax 41 xorl %eax,%eax
42 ret 42 ret
43 CFI_ENDPROC 43 CFI_ENDPROC
@@ -51,7 +51,7 @@ ENTRY(__put_user_2)
51 cmpq TI_addr_limit(%rbx),%rcx 51 cmpq TI_addr_limit(%rbx),%rcx
52 jae 20f 52 jae 20f
53 decq %rcx 53 decq %rcx
542: movw %dx,(%rcx) 542: movw %ax,(%rcx)
55 xorl %eax,%eax 55 xorl %eax,%eax
56 ret 56 ret
5720: decq %rcx 5720: decq %rcx
@@ -67,7 +67,7 @@ ENTRY(__put_user_4)
67 cmpq TI_addr_limit(%rbx),%rcx 67 cmpq TI_addr_limit(%rbx),%rcx
68 jae 30f 68 jae 30f
69 subq $3,%rcx 69 subq $3,%rcx
703: movl %edx,(%rcx) 703: movl %eax,(%rcx)
71 xorl %eax,%eax 71 xorl %eax,%eax
72 ret 72 ret
7330: subq $3,%rcx 7330: subq $3,%rcx
@@ -83,7 +83,7 @@ ENTRY(__put_user_8)
83 cmpq TI_addr_limit(%rbx),%rcx 83 cmpq TI_addr_limit(%rbx),%rcx
84 jae 40f 84 jae 40f
85 subq $7,%rcx 85 subq $7,%rcx
864: movq %rdx,(%rcx) 864: movq %rax,(%rcx)
87 xorl %eax,%eax 87 xorl %eax,%eax
88 ret 88 ret
8940: subq $7,%rcx 8940: subq $7,%rcx
diff --git a/include/asm-x86/uaccess_64.h b/include/asm-x86/uaccess_64.h
index 21fda9ebee13..f822a36cc1c0 100644
--- a/include/asm-x86/uaccess_64.h
+++ b/include/asm-x86/uaccess_64.h
@@ -130,7 +130,7 @@ extern void __put_user_bad(void);
130#define __put_user_x(size, ret, x, ptr) \ 130#define __put_user_x(size, ret, x, ptr) \
131 asm volatile("call __put_user_" #size \ 131 asm volatile("call __put_user_" #size \
132 :"=a" (ret) \ 132 :"=a" (ret) \
133 :"c" (ptr),"d" (x) \ 133 :"c" (ptr),"a" (x) \
134 :"ebx") 134 :"ebx")
135 135
136#define put_user(x, ptr) \ 136#define put_user(x, ptr) \