From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 3 Jan 2009 05:07:14 +0000 (+1030)
Subject: cris: define __fls
X-Git-Tag: v2.6.29-rc1~521^2~10^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0999769e6cad9b0e5abb7c513c0c3f16821f0884;p=linux-2.6-omap-h63xx.git

cris: define __fls

Like fls, but can't be handed 0 and returns the bit number.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

diff --git a/arch/cris/include/asm/bitops.h b/arch/cris/include/asm/bitops.h
index c0e62f811e0..9e69cfb7f13 100644
--- a/arch/cris/include/asm/bitops.h
+++ b/arch/cris/include/asm/bitops.h
@@ -148,6 +148,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
 #define ffs kernel_ffs
 
 #include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/hweight.h>
 #include <asm-generic/bitops/find.h>