summaryrefslogtreecommitdiff
path: root/arch/avr32/include/asm/bitops.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-08 08:24:38 +0300
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-08 08:24:38 +0300
commit24f030175d30f019be41766cdf88c2ff03de19ff (patch)
tree354232a84e82d5a721ed7b1a9af580ff2a59be8f /arch/avr32/include/asm/bitops.h
parent4aa12f7b927c3cac0e0cf3503642597527d0ece0 (diff)
parent9e42d0cf5020aaf217433cad1a224745241d212a (diff)
downloadlinux-24f030175d30f019be41766cdf88c2ff03de19ff.tar.xz
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/avr32/include/asm/bitops.h')
-rw-r--r--arch/avr32/include/asm/bitops.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/avr32/include/asm/bitops.h b/arch/avr32/include/asm/bitops.h
index 1a50b69b1a19..f7dd5f71edf7 100644
--- a/arch/avr32/include/asm/bitops.h
+++ b/arch/avr32/include/asm/bitops.h
@@ -263,6 +263,11 @@ static inline int fls(unsigned long word)
return 32 - result;
}
+static inline int __fls(unsigned long word)
+{
+ return fls(word) - 1;
+}
+
unsigned long find_first_zero_bit(const unsigned long *addr,
unsigned long size);
unsigned long find_next_zero_bit(const unsigned long *addr,