From efea505d83873cfc8a7cdbb8a2a11d2c67467843 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 24 Jun 2008 16:59:05 -0300 Subject: [PATCH] x86: don't use word-size specifiers in putuser files. Remove them where unambiguous. Signed-off-by: Glauber Costa Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar --- arch/x86/lib/putuser_32.S | 28 ++++++++++++++-------------- arch/x86/lib/putuser_64.S | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/x86/lib/putuser_32.S b/arch/x86/lib/putuser_32.S index 5b2a926f0e28..b67a37cab1b0 100644 --- a/arch/x86/lib/putuser_32.S +++ b/arch/x86/lib/putuser_32.S @@ -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) diff --git a/arch/x86/lib/putuser_64.S b/arch/x86/lib/putuser_64.S index 6d7513bf885e..c18fc0f5256c 100644 --- a/arch/x86/lib/putuser_64.S +++ b/arch/x86/lib/putuser_64.S @@ -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) -- GitLab