Commit e4550363 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Add brackets to bitops

Add missing argument brackets in bitop macros

Makes these macros somewhat safer to use.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 48c6c59c
...@@ -267,22 +267,22 @@ static inline unsigned long __scanbit(unsigned long val, unsigned long max) ...@@ -267,22 +267,22 @@ static inline unsigned long __scanbit(unsigned long val, unsigned long max)
} }
#define find_first_bit(addr,size) \ #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))) : \ (__scanbit(*(unsigned long *)addr,(size))) : \
find_first_bit(addr,size))) find_first_bit(addr,size)))
#define find_next_bit(addr,size,off) \ #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)))) : \ ((off) + (__scanbit((*(unsigned long *)addr) >> (off),(size)-(off)))) : \
find_next_bit(addr,size,off))) find_next_bit(addr,size,off)))
#define find_first_zero_bit(addr,size) \ #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))) : \ (__scanbit(~*(unsigned long *)addr,(size))) : \
find_first_zero_bit(addr,size))) find_first_zero_bit(addr,size)))
#define find_next_zero_bit(addr,size,off) \ #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)))) : \ ((off)+(__scanbit(~(((*(unsigned long *)addr)) >> (off)),(size)-(off)))) : \
find_next_zero_bit(addr,size,off))) find_next_zero_bit(addr,size,off)))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment