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

[PATCH] fix sparse warnings from {asm,net}/checksum.h

Browse source 
Rename the variable "sum" in the __range_ok macros to avoid name collisions
causing lots of "symbol shadows an earlier one" warnings by sparse.

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Andi Kleen <ak@suse.de>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Acked-by: Ian Molton <spyro@f2s.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tilman Schmidt 2007-02-10 01:45:41 -08:00 committed by Linus Torvalds
parent 3db5db4fcd
commit 16cf5b39b8
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/asm-arm/uaccess.h
View file

@ -76,10 +76,10 @@ static inline void set_fs(mm_segment_t fs)
/* We use 33-bit arithmetic here... */ /* We use 33-bit arithmetic here... */
#define __range_ok(addr,size) ({ \ #define __range_ok(addr,size) ({ \
unsigned long flag, sum; \ unsigned long flag, roksum; \
__chk_user_ptr(addr); \ __chk_user_ptr(addr); \
__asm__("adds %1, %2, %3; sbcccs %1, %1, %0; movcc %0, #0" \ __asm__("adds %1, %2, %3; sbcccs %1, %1, %0; movcc %0, #0" \
: "=&r" (flag), "=&r" (sum) \ : "=&r" (flag), "=&r" (roksum) \
: "r" (addr), "Ir" (size), "0" (current_thread_info()->addr_limit) \ : "r" (addr), "Ir" (size), "0" (current_thread_info()->addr_limit) \
: "cc"); \ : "cc"); \
flag; }) flag; })

4
include/asm-arm26/uaccess-asm.h
View file

@ -34,9 +34,9 @@ static inline void set_fs (mm_segment_t fs)
} }
#define __range_ok(addr,size) ({ \ #define __range_ok(addr,size) ({ \
unsigned long flag, sum; \ unsigned long flag, roksum; \
__asm__ __volatile__("subs %1, %0, %3; cmpcs %1, %2; movcs %0, #0" \ __asm__ __volatile__("subs %1, %0, %3; cmpcs %1, %2; movcs %0, #0" \
: "=&r" (flag), "=&r" (sum) \ : "=&r" (flag), "=&r" (roksum) \
: "r" (addr), "Ir" (size), "0" (current_thread_info()->addr_limit) \ : "r" (addr), "Ir" (size), "0" (current_thread_info()->addr_limit) \
: "cc"); \ : "cc"); \
flag; }) flag; })

4
include/asm-i386/uaccess.h
View file

@ -54,10 +54,10 @@ 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_ok(addr,size) ({ \
unsigned long flag,sum; \ 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("addl %3,%1 ; sbbl %0,%0; cmpl %1,%4; sbbl $0,%0" \
:"=&r" (flag), "=r" (sum) \ :"=&r" (flag), "=r" (roksum) \
:"1" (addr),"g" ((int)(size)),"rm" (current_thread_info()->addr_limit.seg)); \ :"1" (addr),"g" ((int)(size)),"rm" (current_thread_info()->addr_limit.seg)); \
flag; }) flag; })

4
include/asm-m32r/uaccess.h
View file

@ -68,7 +68,7 @@ static inline void set_fs(mm_segment_t s)
* 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_ok(addr,size) ({ \
unsigned long flag, sum; \ unsigned long flag, roksum; \
__chk_user_ptr(addr); \ __chk_user_ptr(addr); \
asm ( \ asm ( \
" cmpu %1, %1 ; clear cbit\n" \ " cmpu %1, %1 ; clear cbit\n" \
@ -76,7 +76,7 @@ static inline void set_fs(mm_segment_t s)
" subx %0, %0\n" \ " subx %0, %0\n" \
" cmpu %4, %1\n" \ " cmpu %4, %1\n" \
" subx %0, %5\n" \ " subx %0, %5\n" \
: "=&r" (flag), "=r" (sum) \ : "=&r" (flag), "=r" (roksum) \
: "1" (addr), "r" ((int)(size)), \ : "1" (addr), "r" ((int)(size)), \
"r" (current_thread_info()->addr_limit.seg), "r" (0) \ "r" (current_thread_info()->addr_limit.seg), "r" (0) \
: "cbit" ); \ : "cbit" ); \

4
include/asm-x86_64/uaccess.h
View file

@ -37,11 +37,11 @@
* Uhhuh, this needs 65-bit arithmetic. We have a carry.. * Uhhuh, this needs 65-bit arithmetic. We have a carry..
*/ */
#define __range_not_ok(addr,size) ({ \ #define __range_not_ok(addr,size) ({ \
unsigned long flag,sum; \ unsigned long flag,roksum; \
__chk_user_ptr(addr); \ __chk_user_ptr(addr); \
asm("# range_ok\n\r" \ asm("# range_ok\n\r" \
"addq %3,%1 ; sbbq %0,%0 ; cmpq %1,%4 ; sbbq $0,%0" \ "addq %3,%1 ; sbbq %0,%0 ; cmpq %1,%4 ; sbbq $0,%0" \
:"=&r" (flag), "=r" (sum) \ :"=&r" (flag), "=r" (roksum) \
:"1" (addr),"g" ((long)(size)),"g" (current_thread_info()->addr_limit.seg)); \ :"1" (addr),"g" ((long)(size)),"g" (current_thread_info()->addr_limit.seg)); \
flag; }) flag; })