summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2005-01-04 05:14:46 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-04 05:14:46 -0800
commitfc1d4be6b015e2c34847df3994d80f3eec44cc42 (patch)
tree20f310b831d27ecf30a1a83a8ed4b3f2c272b197 /include/linux
parentcc07552d93c5faa2fcaae251e61532fdebfff13d (diff)
[PATCH] out-of-line implementation of find_next_bit()
The attached patch provides an out-of-line implementation of find_next_bit() and rearranges linux/bitops.h to avoid a dependency loop between inline functions in there and in asm/bitops.h trying to include one another. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bitops.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index bcb0b1e1bff1..48f87b979ca9 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -1,7 +1,6 @@
#ifndef _LINUX_BITOPS_H
#define _LINUX_BITOPS_H
#include <asm/types.h>
-#include <asm/bitops.h>
/*
* ffs: find first bit set. This is defined the same way as
@@ -71,6 +70,12 @@ static __inline__ int generic_fls(int x)
return r;
}
+/*
+ * Include this here because some architectures need generic_ffs/fls in
+ * scope
+ */
+#include <asm/bitops.h>
+
static __inline__ int get_bitmask_order(unsigned int count)
{
int order;