diff --git a/arch/arm/cpu/Kconfig b/arch/arm/cpu/Kconfig
index 2577103..f8abbcc 100644
--- a/arch/arm/cpu/Kconfig
+++ b/arch/arm/cpu/Kconfig
@@ -86,6 +86,7 @@
 	select CPU_64v8
 	select CPU_SUPPORTS_64BIT_KERNEL
 	select ARM_EXCEPTIONS
+	select GENERIC_FIND_NEXT_BIT
 
 config CPU_XSC3
         bool
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
index 348a76b..d8a4d9b 100644
--- a/arch/arm/include/asm/bitops.h
+++ b/arch/arm/include/asm/bitops.h
@@ -82,6 +82,12 @@
 #define test_and_clear_bit(x, y)	__test_and_clear_bit(x, y)
 #define test_and_change_bit(x, y)	__test_and_change_bit(x, y)
 
+#ifdef CONFIG_CPU_V8
+
+#include <asm-generic/bitops/find.h>
+
+#else /* CONFIG_CPU_V8 */
+
 #ifndef __ARMEB__
 /*
  * These are the little endian definitions.
@@ -115,6 +121,8 @@
 
 #endif		/* __ARMEB__ */
 
+#endif /* CONFIG_CPU_V8 */
+
 #if defined (CONFIG_CPU_32) && defined(__LINUX_ARM_ARCH__) && (__LINUX_ARM_ARCH__ >= 5)
 static inline int constant_fls(int x)
 {