alpha: cleanup in bitops.h

Remove 2 functions private to the alpha implemetation,
in favor of similar functions in <linux/log2.h>.

Provide a more efficient version of the fls64 function
for pre-ev67 alphas.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index 915f26345c4..bd5e68cd61e 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -43,6 +43,7 @@
 #include <linux/notifier.h>
 #include <asm/setup.h>
 #include <asm/io.h>
+#include <linux/log2.h>
 
 extern struct atomic_notifier_head panic_notifier_list;
 static int alpha_panic_event(struct notifier_block *, unsigned long, void *);
@@ -1303,7 +1304,7 @@ external_cache_probe(int minsize, int width)
         long size = minsize, maxsize = MAX_BCACHE_SIZE * 2;
 
         if (maxsize > (max_low_pfn + 1) << PAGE_SHIFT)
-                maxsize = 1 << (floor_log2(max_low_pfn + 1) + PAGE_SHIFT);
+                maxsize = 1 << (ilog2(max_low_pfn + 1) + PAGE_SHIFT);
 
         /* Get the first block cached. */
         read_mem_block(__va(0), stride, size);