|
@@ -558,6 +558,8 @@ static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long *
|
|
|
__clear_bit(nr, addr);
|
|
|
}
|
|
|
|
|
|
+#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
|
|
|
+
|
|
|
/*
|
|
|
* Return the bit position (0..63) of the most significant 1 bit in a word
|
|
|
* Returns -1 if no 1 bit exists
|
|
@@ -596,8 +598,6 @@ static inline unsigned long __fls(unsigned long x)
|
|
|
return __ilog2(x);
|
|
|
}
|
|
|
|
|
|
-#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
|
|
|
-
|
|
|
/*
|
|
|
* __ffs - find first bit in word.
|
|
|
* @word: The word to search
|
|
@@ -654,6 +654,7 @@ static inline int ffs(int word)
|
|
|
#else
|
|
|
|
|
|
#include <asm-generic/bitops/__ffs.h>
|
|
|
+#include <asm-generic/bitops/__fls.h>
|
|
|
#include <asm-generic/bitops/ffs.h>
|
|
|
#include <asm-generic/bitops/fls.h>
|
|
|
#include <asm-generic/bitops/fls64.h>
|