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

Commit efea505d authored Jun 24, 2008 by Glauber Costa Committed by Ingo Molnar Jul 09, 2008

x86: don't use word-size specifiers in putuser files.



Remove them where unambiguous.

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>

parent 766ed428

arch/x86/lib/putuser_32.S

+14 −14

Original line number	Diff line number	Diff line
		@@ -33,44 +33,44 @@
		.text
		ENTRY(__put_user_1)
		ENTER
		cmpl TI_addr_limit(%ebx),%ecx
		cmp TI_addr_limit(%ebx),%ecx
		jae bad_put_user
		1: movb %al,(%ecx)
		xorl %eax,%eax
		xor %eax,%eax
		EXIT
		ENDPROC(__put_user_1)

		ENTRY(__put_user_2)
		ENTER
		movl TI_addr_limit(%ebx),%ebx
		subl $1,%ebx
		cmpl %ebx,%ecx
		mov TI_addr_limit(%ebx),%ebx
		sub $1,%ebx
		cmp %ebx,%ecx
		jae bad_put_user
		2: movw %ax,(%ecx)
		xorl %eax,%eax
		xor %eax,%eax
		EXIT
		ENDPROC(__put_user_2)

		ENTRY(__put_user_4)
		ENTER
		movl TI_addr_limit(%ebx),%ebx
		subl $3,%ebx
		cmpl %ebx,%ecx
		mov TI_addr_limit(%ebx),%ebx
		sub $3,%ebx
		cmp %ebx,%ecx
		jae bad_put_user
		3: movl %eax,(%ecx)
		xorl %eax,%eax
		xor %eax,%eax
		EXIT
		ENDPROC(__put_user_4)

		ENTRY(__put_user_8)
		ENTER
		movl TI_addr_limit(%ebx),%ebx
		subl $7,%ebx
		cmpl %ebx,%ecx
		mov TI_addr_limit(%ebx),%ebx
		sub $7,%ebx
		cmp %ebx,%ecx
		jae bad_put_user
		4: movl %eax,(%ecx)
		5: movl %edx,4(%ecx)
		xorl %eax,%eax
		xor %eax,%eax
		EXIT
		ENDPROC(__put_user_8)

arch/x86/lib/putuser_64.S

+7 −7

Original line number	Diff line number	Diff line
		@@ -39,10 +39,10 @@
		.text
		ENTRY(__put_user_1)
		ENTER
		cmpq TI_addr_limit(%rbx),%rcx
		cmp TI_addr_limit(%rbx),%rcx
		jae bad_put_user
		1: movb %al,(%rcx)
		xorl %eax,%eax
		xor %eax,%eax
		EXIT
		ENDPROC(__put_user_1)

		@@ -50,10 +50,10 @@ ENTRY(__put_user_2)
		ENTER
		mov TI_addr_limit(%rbx),%rbx
		sub $1, %rbx
		cmpq %rbx ,%rcx
		cmp %rbx ,%rcx
		jae bad_put_user
		2: movw %ax,(%rcx)
		xorl %eax,%eax
		xor %eax,%eax
		EXIT
		ENDPROC(__put_user_2)

		@@ -64,7 +64,7 @@ ENTRY(__put_user_4)
		cmp %rbx, %rcx
		jae bad_put_user
		3: movl %eax,(%rcx)
		xorl %eax,%eax
		xor %eax,%eax
		EXIT
		ENDPROC(__put_user_4)

		@@ -75,13 +75,13 @@ ENTRY(__put_user_8)
		cmp %rbx, %rcx
		jae bad_put_user
		4: movq %rax,(%rcx)
		xorl %eax,%eax
		xor %eax,%eax
		EXIT
		ENDPROC(__put_user_8)

		bad_put_user:
		CFI_STARTPROC
		movq $(-EFAULT),%rax
		mov $(-EFAULT),%rax
		EXIT
		END(bad_put_user)