X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Fuser-bitops.h;h=1b16ca77a28f46fd05745b3c73b493166e5a3ae4;hb=ed2430bd5a8b1b61ce9ae5c4a321598dee728199;hp=7b31bc95b9aee18217554d49b900cc0d2f80d7c7;hpb=001b8dbfacb747f1649a2eb047a5f118ce32fdc7;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/user-bitops.h b/libcfs/include/libcfs/user-bitops.h
index 7b31bc9..1b16ca77 100644
--- a/libcfs/include/libcfs/user-bitops.h
+++ b/libcfs/include/libcfs/user-bitops.h
@@ -76,7 +76,7 @@ static inline int test_bit(int nr, const unsigned long *addr)
 }
 
 /* using binary seach */
-static inline unsigned long __fls(long data)
+static __inline__ unsigned long fls(long data)
 {
 	int pos = 32;
 
@@ -115,7 +115,7 @@ static inline unsigned long __fls(long data)
 	return pos;
 }
 
-static inline unsigned long __ffs(long data)
+static __inline__ unsigned long __cfs_ffs(long data)
 {
         int pos = 0;
 
@@ -147,8 +147,8 @@ static inline unsigned long __ffs(long data)
         return pos;
 }
 
-#define __ffz(x)	__ffs(~(x))
-#define __flz(x)	__fls(~(x))
+#define ffz(x)		ffs(~(x))
+#define flz(x)		fls(~(x))
 
 unsigned long find_next_bit(unsigned long *addr,
 			    unsigned long size, unsigned long offset);