From 24428a5d19f19b88d72d4cd799b5606aac359e82 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 4 May 2008 14:53:53 +0100
Subject: [PATCH] --- yaml --- r: 96430 b: refs/heads/master c:
 ddc0d009947bf8645fa3543f4532063a787202da h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-mips/bitops.h | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index df46763d9560..358cfb9813db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcd84f2fca49166dab2dba259eca6e633585763f
+refs/heads/master: ddc0d009947bf8645fa3543f4532063a787202da
diff --git a/trunk/include/asm-mips/bitops.h b/trunk/include/asm-mips/bitops.h
index 5e1f590a24a1..642724734eba 100644
--- a/trunk/include/asm-mips/bitops.h
+++ b/trunk/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);
 }
 
 /*