diff options
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/bitops.h | 6 | ||||
-rw-r--r-- | include/asm-x86/bitops_64.h | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-x86/bitops.h b/include/asm-x86/bitops.h index 31e408de90c6..1ae7b270a1ef 100644 --- a/include/asm-x86/bitops.h +++ b/include/asm-x86/bitops.h | |||
@@ -306,12 +306,6 @@ static int test_bit(int nr, const volatile unsigned long *addr); | |||
306 | #undef BIT_ADDR | 306 | #undef BIT_ADDR |
307 | #undef ADDR | 307 | #undef ADDR |
308 | 308 | ||
309 | unsigned long find_next_bit(const unsigned long *addr, | ||
310 | unsigned long size, unsigned long offset); | ||
311 | unsigned long find_next_zero_bit(const unsigned long *addr, | ||
312 | unsigned long size, unsigned long offset); | ||
313 | |||
314 | |||
315 | #ifdef CONFIG_X86_32 | 309 | #ifdef CONFIG_X86_32 |
316 | # include "bitops_32.h" | 310 | # include "bitops_32.h" |
317 | #else | 311 | #else |
diff --git a/include/asm-x86/bitops_64.h b/include/asm-x86/bitops_64.h index 65b20fb2ae78..7118ef2cc4ec 100644 --- a/include/asm-x86/bitops_64.h +++ b/include/asm-x86/bitops_64.h | |||
@@ -15,16 +15,6 @@ static inline long __scanbit(unsigned long val, unsigned long max) | |||
15 | return val; | 15 | return val; |
16 | } | 16 | } |
17 | 17 | ||
18 | #define find_next_bit(addr,size,off) \ | ||
19 | ((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ | ||
20 | ((off) + (__scanbit((*(unsigned long *)addr) >> (off),(size)-(off)))) : \ | ||
21 | find_next_bit(addr,size,off))) | ||
22 | |||
23 | #define find_next_zero_bit(addr,size,off) \ | ||
24 | ((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ | ||
25 | ((off)+(__scanbit(~(((*(unsigned long *)addr)) >> (off)),(size)-(off)))) : \ | ||
26 | find_next_zero_bit(addr,size,off))) | ||
27 | |||
28 | #define find_first_bit(addr, size) \ | 18 | #define find_first_bit(addr, size) \ |
29 | ((__builtin_constant_p((size)) && (size) <= BITS_PER_LONG \ | 19 | ((__builtin_constant_p((size)) && (size) <= BITS_PER_LONG \ |
30 | ? (__scanbit(*(unsigned long *)(addr), (size))) \ | 20 | ? (__scanbit(*(unsigned long *)(addr), (size))) \ |