git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
linux
/
bitops.h
diff --git
a/include/linux/bitops.h
b/include/linux/bitops.h
index
053d6e4
..
48f87b9
100644
(file)
--- 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>
#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
/*
* ffs: find first bit set. This is defined the same way as
@@
-42,7
+41,7
@@
static inline int generic_ffs(int x)
* fls: find last bit set.
*/
* fls: find last bit set.
*/
-
extern
__inline__ int generic_fls(int x)
+
static
__inline__ int generic_fls(int x)
{
int r = 32;
{
int r = 32;
@@
-71,7
+70,13
@@
extern __inline__ int generic_fls(int x)
return r;
}
return r;
}
-extern __inline__ int get_bitmask_order(unsigned int count)
+/*
+ * 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;
{
int order;