X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fuser-bitops.c;h=4a266d378de610e904f163b51357e5970cabb31a;hb=6e3ec5812ebd1b5ecf7cae584f429b013ffe7431;hp=7eb265beb1e847debfa5e3f1ca3d567defa504f6;hpb=0b5b209ffbd457e533e1b956c9268eb5bed8e604;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/user-bitops.c b/libcfs/libcfs/user-bitops.c
index 7eb265b..4a266d3 100644
--- a/libcfs/libcfs/user-bitops.c
+++ b/libcfs/libcfs/user-bitops.c
@@ -40,8 +40,8 @@
 
 #define OFF_BY_START(start)     ((start)/BITS_PER_LONG)
 
-unsigned long find_next_bit(unsigned long *addr,
-                            unsigned long size, unsigned long offset)
+unsigned long cfs_find_next_bit(unsigned long *addr,
+                                unsigned long size, unsigned long offset)
 {
         unsigned long *word, *last;
         unsigned long first_bit, bit, base;
@@ -55,7 +55,7 @@ unsigned long find_next_bit(unsigned long *addr,
                 return size;
         if (first_bit != 0) {
                 int tmp = (*word++) & (~0UL << first_bit);
-                bit = __ffs(tmp);
+                bit = __cfs_ffs(tmp);
                 if (bit < BITS_PER_LONG)
                         goto found;
                 word++;
@@ -63,7 +63,7 @@ unsigned long find_next_bit(unsigned long *addr,
         }
         while (word <= last) {
                 if (*word != 0UL) {
-                        bit = __ffs(*word);
+                        bit = __cfs_ffs(*word);
                         goto found;
                 }
                 word++;
@@ -74,8 +74,8 @@ found:
         return base + bit;
 }
 
-unsigned long find_next_zero_bit(unsigned long *addr,
-                                 unsigned long size, unsigned long offset)
+unsigned long cfs_find_next_zero_bit(unsigned long *addr,
+                                     unsigned long size, unsigned long offset)
 {
         unsigned long *word, *last;
         unsigned long first_bit, bit, base;
@@ -89,7 +89,7 @@ unsigned long find_next_zero_bit(unsigned long *addr,
                 return size;
         if (first_bit != 0) {
                 int tmp = (*word++) & (~0UL << first_bit);
-                bit = __ffz(tmp);
+                bit = __cfs_ffz(tmp);
                 if (bit < BITS_PER_LONG)
                         goto found;
                 word++;
@@ -97,7 +97,7 @@ unsigned long find_next_zero_bit(unsigned long *addr,
         }
         while (word <= last) {
                 if (*word != ~0UL) {
-                        bit = __ffz(*word);
+                        bit = __cfs_ffz(*word);
                         goto found;
                 }
                 word++;