summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-01-01 00:42:18 +0100
committerRusty Russell <rusty@rustcorp.com.au>2009-01-01 00:42:18 +0100
commit434ae514c23047db87a8bbf39cebc9e1767aea44 (patch)
treefae5886a91918f58ebce58b01f691a4391112226
parentblackfin: define __fls (diff)
downloadlinux-434ae514c23047db87a8bbf39cebc9e1767aea44.tar.xz
linux-434ae514c23047db87a8bbf39cebc9e1767aea44.zip
m68k: define __fls
Like fls, but can't be handed 0 and returns the bit number. (I broke this arch in linux-next by using __fls in generic code). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--include/asm-m68k/bitops.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h
index 3e8106442d5a..9bde784e7bad 100644
--- a/include/asm-m68k/bitops.h
+++ b/include/asm-m68k/bitops.h
@@ -315,6 +315,11 @@ static inline int fls(int x)
return 32 - cnt;
}
+static inline int __fls(int x)
+{
+ return fls(x) - 1;
+}
+
#include <asm-generic/bitops/fls64.h>
#include <asm-generic/bitops/sched.h>
#include <asm-generic/bitops/hweight.h>