Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ada3164 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: pass argument to putuser_64 functions in ax register. 



This is consistent with i386 usage.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 770546b9

arch/x86/lib/putuser_64.S

+4 −4
Original line number Diff line number Diff line
@@ -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

include/asm-x86/uaccess_64.h

+1 −1
Original line number Diff line number Diff line
@@ -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)						\