vserver 1.9.5.x5

[linux-2.6.git] / include / asm-x86_64 / bitops.h

diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h
index c44e168..5dd7727 100644 (file)
--- a/include/asm-x86_64/bitops.h
+++ b/include/asm-x86_64/bitops.h
@@ -267,22 +267,22 @@ static inline unsigned long __scanbit(unsigned long val, unsigned long max)
 }
 
 #define find_first_bit(addr,size) \
-((__builtin_constant_p(size) && size <= BITS_PER_LONG ? \
+((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \
   (__scanbit(*(unsigned long *)addr,(size))) : \
   find_first_bit(addr,size)))
 
 #define find_next_bit(addr,size,off) \
-((__builtin_constant_p(size) && size <= BITS_PER_LONG ?          \
+((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ?        \
   ((off) + (__scanbit((*(unsigned long *)addr) >> (off),(size)-(off)))) : \
        find_next_bit(addr,size,off)))
 
 #define find_first_zero_bit(addr,size) \
-((__builtin_constant_p(size) && size <= BITS_PER_LONG ? \
+((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \
   (__scanbit(~*(unsigned long *)addr,(size))) : \
        find_first_zero_bit(addr,size)))
        
 #define find_next_zero_bit(addr,size,off) \
-((__builtin_constant_p(size) && size <= BITS_PER_LONG ?          \
+((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ?        \
   ((off)+(__scanbit(~(((*(unsigned long *)addr)) >> (off)),(size)-(off)))) : \
        find_next_zero_bit(addr,size,off)))