[XFS] Fix merge failures

[pandora-kernel.git] / include / linux / bitops.h

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 48bde60..024f2b0 100644 (file)
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -6,8 +6,8 @@
 #define BIT(nr)                        (1UL << (nr))
 #define BIT_MASK(nr)           (1UL << ((nr) % BITS_PER_LONG))
 #define BIT_WORD(nr)           ((nr) / BITS_PER_LONG)
-#define BITS_TO_LONGS(nr)      DIV_ROUND_UP(nr, BITS_PER_LONG)
 #define BITS_PER_BYTE          8
+#define BITS_TO_LONGS(nr)      DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
 #endif
 
 /*
@@ -114,8 +114,6 @@ static inline unsigned fls_long(unsigned long l)
 
 #ifdef __KERNEL__
 #ifdef CONFIG_GENERIC_FIND_FIRST_BIT
-extern unsigned long __find_first_bit(const unsigned long *addr,
-               unsigned long size);
 
 /**
  * find_first_bit - find the first set bit in a memory region
@@ -124,28 +122,8 @@ extern unsigned long __find_first_bit(const unsigned long *addr,
  *
  * Returns the bit number of the first set bit.
  */
-static __always_inline unsigned long
-find_first_bit(const unsigned long *addr, unsigned long size)
-{
-       /* Avoid a function call if the bitmap size is a constant */
-       /* and not bigger than BITS_PER_LONG. */
-
-       /* insert a sentinel so that __ffs returns size if there */
-       /* are no set bits in the bitmap */
-       if (__builtin_constant_p(size) && (size < BITS_PER_LONG))
-               return __ffs((*addr) | (1ul << size));
-
-       /* the result of __ffs(0) is undefined, so it needs to be */
-       /* handled separately */
-       if (__builtin_constant_p(size) && (size == BITS_PER_LONG))
-               return ((*addr) == 0) ? BITS_PER_LONG : __ffs(*addr);
-
-       /* size is not constant or too big */
-       return __find_first_bit(addr, size);
-}
-
-extern unsigned long __find_first_zero_bit(const unsigned long *addr,
-               unsigned long size);
+extern unsigned long find_first_bit(const unsigned long *addr,
+                                   unsigned long size);
 
 /**
  * find_first_zero_bit - find the first cleared bit in a memory region
@@ -154,31 +132,12 @@ extern unsigned long __find_first_zero_bit(const unsigned long *addr,
  *
  * Returns the bit number of the first cleared bit.
  */
-static __always_inline unsigned long
-find_first_zero_bit(const unsigned long *addr, unsigned long size)
-{
-       /* Avoid a function call if the bitmap size is a constant */
-       /* and not bigger than BITS_PER_LONG. */
-
-       /* insert a sentinel so that __ffs returns size if there */
-       /* are no set bits in the bitmap */
-       if (__builtin_constant_p(size) && (size < BITS_PER_LONG)) {
-               return __ffs(~(*addr) | (1ul << size));
-       }
-
-       /* the result of __ffs(0) is undefined, so it needs to be */
-       /* handled separately */
-       if (__builtin_constant_p(size) && (size == BITS_PER_LONG))
-               return (~(*addr) == 0) ? BITS_PER_LONG : __ffs(~(*addr));
-
-       /* size is not constant or too big */
-       return __find_first_zero_bit(addr, size);
-}
+extern unsigned long find_first_zero_bit(const unsigned long *addr,
+                                        unsigned long size);
+
 #endif /* CONFIG_GENERIC_FIND_FIRST_BIT */
 
 #ifdef CONFIG_GENERIC_FIND_NEXT_BIT
-extern unsigned long __find_next_bit(const unsigned long *addr,
-               unsigned long size, unsigned long offset);
 
 /**
  * find_next_bit - find the next set bit in a memory region
@@ -186,36 +145,8 @@ extern unsigned long __find_next_bit(const unsigned long *addr,
  * @offset: The bitnumber to start searching at
  * @size: The bitmap size in bits
  */
-static __always_inline unsigned long
-find_next_bit(const unsigned long *addr, unsigned long size,
-               unsigned long offset)
-{
-       unsigned long value;
-
-       /* Avoid a function call if the bitmap size is a constant */
-       /* and not bigger than BITS_PER_LONG. */
-
-       /* insert a sentinel so that __ffs returns size if there */
-       /* are no set bits in the bitmap */
-       if (__builtin_constant_p(size) && (size < BITS_PER_LONG)) {
-               value = (*addr) & ((~0ul) << offset);
-               value |= (1ul << size);
-               return __ffs(value);
-       }
-
-       /* the result of __ffs(0) is undefined, so it needs to be */
-       /* handled separately */
-       if (__builtin_constant_p(size) && (size == BITS_PER_LONG)) {
-               value = (*addr) & ((~0ul) << offset);
-               return (value == 0) ? BITS_PER_LONG : __ffs(value);
-       }
-
-       /* size is not constant or too big */
-       return __find_next_bit(addr, size, offset);
-}
-
-extern unsigned long __find_next_zero_bit(const unsigned long *addr,
-               unsigned long size, unsigned long offset);
+extern unsigned long find_next_bit(const unsigned long *addr,
+                                  unsigned long size, unsigned long offset);
 
 /**
  * find_next_zero_bit - find the next cleared bit in a memory region
@@ -223,33 +154,11 @@ extern unsigned long __find_next_zero_bit(const unsigned long *addr,
  * @offset: The bitnumber to start searching at
  * @size: The bitmap size in bits
  */
-static __always_inline unsigned long
-find_next_zero_bit(const unsigned long *addr, unsigned long size,
-               unsigned long offset)
-{
-       unsigned long value;
-
-       /* Avoid a function call if the bitmap size is a constant */
-       /* and not bigger than BITS_PER_LONG. */
-
-       /* insert a sentinel so that __ffs returns size if there */
-       /* are no set bits in the bitmap */
-       if (__builtin_constant_p(size) && (size < BITS_PER_LONG)) {
-               value = (~(*addr)) & ((~0ul) << offset);
-               value |= (1ul << size);
-               return __ffs(value);
-       }
-
-       /* the result of __ffs(0) is undefined, so it needs to be */
-       /* handled separately */
-       if (__builtin_constant_p(size) && (size == BITS_PER_LONG)) {
-               value = (~(*addr)) & ((~0ul) << offset);
-               return (value == 0) ? BITS_PER_LONG : __ffs(value);
-       }
-
-       /* size is not constant or too big */
-       return __find_next_zero_bit(addr, size, offset);
-}
+
+extern unsigned long find_next_zero_bit(const unsigned long *addr,
+                                       unsigned long size,
+                                       unsigned long offset);
+
 #endif /* CONFIG_GENERIC_FIND_NEXT_BIT */
 #endif /* __KERNEL__ */
 #endif