1 files changed, 2 insertions, 0 deletions

diff --git a/include/asm-x86/bitops_64.h b/include/asm-x86/bitops_64.h
index d13352087191..4081d7ecc2bd 100644
--- a/include/asm-x86/bitops_64.h
+++ b/include/asm-x86/bitops_64.h
@@ -5,6 +5,7 @@
  * Copyright 1992, Linus Torvalds.
  */
 
+#ifndef CONFIG_GENERIC_FIND_FIRST_BIT
 extern long find_first_zero_bit(const unsigned long *addr, unsigned long size);
 extern long find_first_bit(const unsigned long *addr, unsigned long size);
 
@@ -24,6 +25,7 @@ static inline long __scanbit(unsigned long val, unsigned long max)
         ((__builtin_constant_p((size)) && (size) <= BITS_PER_LONG       \
           ? (__scanbit(~*(unsigned long *)(addr), (size)))              \
           : find_first_zero_bit((addr), (size))))
+#endif
 
 static inline void set_bit_string(unsigned long *bitmap, unsigned long i,
                                   int len)