summaryrefslogtreecommitdiffstats
path: root/arch/cris/include
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-01-03 06:07:14 +0100
committerRusty Russell <rusty@rustcorp.com.au>2009-01-03 06:07:14 +0100
commit0999769e6cad9b0e5abb7c513c0c3f16821f0884 (patch)
treea3b48abf6454950045f14dff6e7ee9fa82e80428 /arch/cris/include
parentcpumask: CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS (diff)
downloadlinux-0999769e6cad9b0e5abb7c513c0c3f16821f0884.tar.xz
linux-0999769e6cad9b0e5abb7c513c0c3f16821f0884.zip
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>
Diffstat (limited to 'arch/cris/include')
-rw-r--r--arch/cris/include/asm/bitops.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/asm/bitops.h b/arch/cris/include/asm/bitops.h
index c0e62f811e09..9e69cfb7f134 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>