From a1099036c47813412aea96e325ff7c9a76340d04 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Tue, 24 Jun 2008 11:21:53 -0300 Subject: [PATCH] --- yaml --- r: 100050 b: refs/heads/master c: ef8c1a2d0e990d0f4f15e1d45eeb262755e3d4c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/lib/getuser_64.S | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 34cc61dc3a27..ede5871ad3cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26ccb8a7183eed424ff9c874c83af20dafe7cdef +refs/heads/master: ef8c1a2d0e990d0f4f15e1d45eeb262755e3d4c3 diff --git a/trunk/arch/x86/lib/getuser_64.S b/trunk/arch/x86/lib/getuser_64.S index 0ec7890f9dcc..6134752a75fd 100644 --- a/trunk/arch/x86/lib/getuser_64.S +++ b/trunk/arch/x86/lib/getuser_64.S @@ -37,57 +37,57 @@ ENTRY(__get_user_1) CFI_STARTPROC GET_THREAD_INFO(%rdx) - cmpq TI_addr_limit(%rdx),%rax + cmp TI_addr_limit(%rdx),%rax jae bad_get_user 1: movzb (%rax),%edx - xorl %eax,%eax + xor %eax,%eax ret CFI_ENDPROC ENDPROC(__get_user_1) ENTRY(__get_user_2) CFI_STARTPROC - addq $1,%rax + add $1,%rax jc bad_get_user GET_THREAD_INFO(%rdx) - cmpq TI_addr_limit(%rdx),%rax + cmp TI_addr_limit(%rdx),%rax jae bad_get_user 2: movzwl -1(%rax),%edx - xorl %eax,%eax + xor %eax,%eax ret CFI_ENDPROC ENDPROC(__get_user_2) ENTRY(__get_user_4) CFI_STARTPROC - addq $3,%rax + add $3,%rax jc bad_get_user GET_THREAD_INFO(%rdx) - cmpq TI_addr_limit(%rdx),%rax + cmp TI_addr_limit(%rdx),%rax jae bad_get_user -3: movl -3(%rax),%edx - xorl %eax,%eax +3: mov -3(%rax),%edx + xor %eax,%eax ret CFI_ENDPROC ENDPROC(__get_user_4) ENTRY(__get_user_8) CFI_STARTPROC - addq $7,%rax + add $7,%rax jc bad_get_user GET_THREAD_INFO(%rdx) - cmpq TI_addr_limit(%rdx),%rax + cmp TI_addr_limit(%rdx),%rax jae bad_get_user 4: movq -7(%rax),%rdx - xorl %eax,%eax + xor %eax,%eax ret CFI_ENDPROC ENDPROC(__get_user_8) bad_get_user: CFI_STARTPROC - xorl %edx,%edx - movq $(-EFAULT),%rax + xor %edx,%edx + mov $(-EFAULT),%rax ret CFI_ENDPROC END(bad_get_user)