Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: commonize __range_not_ok.

Browse source 
For i386, __range_not_ok is a better name than __range_ok, since
it returns 0 when it is in fact okay. Other than that,
both versions does not need the word size specifiers, and we remove them.

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>
This commit is contained in:
Glauber Costa 2008-06-25 10:14:13 -03:00 committed by Ingo Molnar
parent 5cbbc3b1eb
commit 53938a68a2
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/asm-x86/uaccess_32.h
View file

@ -56,11 +56,11 @@ extern struct movsl_mask {
* *
* This needs 33-bit arithmetic. We have a carry... * This needs 33-bit arithmetic. We have a carry...
*/ */
#define __range_ok(addr, size) \ #define __range_not_ok(addr, size) \
({ \ ({ \
unsigned long flag, roksum; \ unsigned long flag, roksum; \
__chk_user_ptr(addr); \ __chk_user_ptr(addr); \
asm("addl %3,%1 ; sbbl %0,%0; cmpl %1,%4; sbbl $0,%0" \ asm("add %3,%1 ; sbb %0,%0; cmp %1,%4; sbb $0,%0" \
:"=&r" (flag), "=r" (roksum) \ :"=&r" (flag), "=r" (roksum) \
:"1" (addr), "g" ((int)(size)), \ :"1" (addr), "g" ((int)(size)), \
"rm" (current_thread_info()->addr_limit.seg)); \ "rm" (current_thread_info()->addr_limit.seg)); \
@ -86,7 +86,7 @@ extern struct movsl_mask {
* checks that the pointer is in the user space range - after calling * checks that the pointer is in the user space range - after calling
* this function, memory access functions may still return -EFAULT. * this function, memory access functions may still return -EFAULT.
*/ */
#define access_ok(type, addr, size) (likely(__range_ok(addr, size) == 0)) #define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the

3
include/asm-x86/uaccess_64.h
View file

@ -41,8 +41,7 @@
({ \ ({ \
unsigned long flag, roksum; \ unsigned long flag, roksum; \
__chk_user_ptr(addr); \ __chk_user_ptr(addr); \
asm("# range_ok\n\r" \ asm("add %3,%1 ; sbb %0,%0 ; cmp %1,%4 ; sbb $0,%0" \
"addq %3,%1 ; sbbq %0,%0 ; cmpq %1,%4 ; sbbq $0,%0" \
: "=&r" (flag), "=r" (roksum) \ : "=&r" (flag), "=r" (roksum) \
: "1" (addr), "g" ((long)(size)), \ : "1" (addr), "g" ((long)(size)), \
"g" (current_thread_info()->addr_limit.seg)); \ "g" (current_thread_info()->addr_limit.seg)); \