diff options
| -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 5e1f590a24a1..642724734eba 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 * | |||
| 564 | * Return the bit position (0..63) of the most significant 1 bit in a word | 564 | * Return the bit position (0..63) of the most significant 1 bit in a word |
| 565 | * Returns -1 if no 1 bit exists | 565 | * Returns -1 if no 1 bit exists |
| 566 | */ | 566 | */ |
| 567 | static inline int __ilog2(unsigned long x) | 567 | static inline unsigned long __fls(unsigned long x) |
| 568 | { | 568 | { |
| 569 | int lz; | 569 | int lz; |
| 570 | 570 | ||
| @@ -593,11 +593,6 @@ static inline int __ilog2(unsigned long x) | |||
| 593 | return 63 - lz; | 593 | return 63 - lz; |
| 594 | } | 594 | } |
| 595 | 595 | ||
| 596 | static inline unsigned long __fls(unsigned long x) | ||
| 597 | { | ||
| 598 | return __ilog2(x); | ||
| 599 | } | ||
| 600 | |||
| 601 | /* | 596 | /* |
| 602 | * __ffs - find first bit in word. | 597 | * __ffs - find first bit in word. |
| 603 | * @word: The word to search | 598 | * @word: The word to search |
| @@ -607,7 +602,7 @@ static inline unsigned long __fls(unsigned long x) | |||
| 607 | */ | 602 | */ |
| 608 | static inline unsigned long __ffs(unsigned long word) | 603 | static inline unsigned long __ffs(unsigned long word) |
| 609 | { | 604 | { |
| 610 | return __ilog2(word & -word); | 605 | return __fls(word & -word); |
| 611 | } | 606 | } |
| 612 | 607 | ||
| 613 | /* | 608 | /* |
