diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2008-05-04 14:53:53 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-05-12 16:46:55 +0100 |
| commit | ddc0d009947bf8645fa3543f4532063a787202da (patch) | |
| tree | a55190a6f4798ac4b87b128ba513bbebf2c86829 /include/asm-mips | |
| parent | fcd84f2fca49166dab2dba259eca6e633585763f (diff) | |
| download | kernel_samsung_aries-ddc0d009947bf8645fa3543f4532063a787202da.zip kernel_samsung_aries-ddc0d009947bf8645fa3543f4532063a787202da.tar.gz kernel_samsung_aries-ddc0d009947bf8645fa3543f4532063a787202da.tar.bz2 | |
[MIPS] Get rid of __ilog2
56a6b1eb7bfb5ace0b5cb9c149f502fbd101b8ab was a bit too conservative and
left __ilog2 around which is only used as an internal function for other
bitops.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/bitops.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index 5e1f590..6427247 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h @@ -564,7 +564,7 @@ static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long * * Return the bit position (0..63) of the most significant 1 bit in a word * Returns -1 if no 1 bit exists */ -static inline int __ilog2(unsigned long x) +static inline unsigned long __fls(unsigned long x) { int lz; @@ -593,11 +593,6 @@ static inline int __ilog2(unsigned long x) return 63 - lz; } -static inline unsigned long __fls(unsigned long x) -{ - return __ilog2(x); -} - /* * __ffs - find first bit in word. * @word: The word to search @@ -607,7 +602,7 @@ static inline unsigned long __fls(unsigned long x) */ static inline unsigned long __ffs(unsigned long word) { - return __ilog2(word & -word); + return __fls(word & -word); } /* |