|
@@ -281,27 +281,42 @@ unsigned long __arch_hweight64(__u64 w);
|
|
|
|
|
|
/* Little-endian versions */
|
|
|
|
|
|
-static __inline__ int test_le_bit(unsigned long nr,
|
|
|
- __const__ unsigned long *addr)
|
|
|
+static __inline__ int test_bit_le(unsigned long nr,
|
|
|
+ __const__ void *addr)
|
|
|
{
|
|
|
__const__ unsigned char *tmp = (__const__ unsigned char *) addr;
|
|
|
return (tmp[nr >> 3] >> (nr & 7)) & 1;
|
|
|
}
|
|
|
|
|
|
-#define __set_le_bit(nr, addr) \
|
|
|
- __set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
|
|
|
-#define __clear_le_bit(nr, addr) \
|
|
|
- __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
|
|
|
+static inline void __set_bit_le(int nr, void *addr)
|
|
|
+{
|
|
|
+ __set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
|
|
|
+}
|
|
|
+
|
|
|
+static inline void __clear_bit_le(int nr, void *addr)
|
|
|
+{
|
|
|
+ __clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
|
|
|
+}
|
|
|
|
|
|
-#define test_and_set_le_bit(nr, addr) \
|
|
|
- test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
|
|
|
-#define test_and_clear_le_bit(nr, addr) \
|
|
|
- test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
|
|
|
+static inline int test_and_set_bit_le(int nr, void *addr)
|
|
|
+{
|
|
|
+ return test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
|
|
|
+}
|
|
|
|
|
|
-#define __test_and_set_le_bit(nr, addr) \
|
|
|
- __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
|
|
|
-#define __test_and_clear_le_bit(nr, addr) \
|
|
|
- __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
|
|
|
+static inline int test_and_clear_bit_le(int nr, void *addr)
|
|
|
+{
|
|
|
+ return test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
|
|
|
+}
|
|
|
+
|
|
|
+static inline int __test_and_set_bit_le(int nr, void *addr)
|
|
|
+{
|
|
|
+ return __test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
|
|
|
+}
|
|
|
+
|
|
|
+static inline int __test_and_clear_bit_le(int nr, void *addr)
|
|
|
+{
|
|
|
+ return __test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
|
|
|
+}
|
|
|
|
|
|
#define find_first_zero_bit_le(addr, size) \
|
|
|
find_next_zero_bit_le((addr), (size), 0)
|
|
@@ -313,16 +328,16 @@ unsigned long find_next_bit_le(const void *addr,
|
|
|
/* Bitmap functions for the ext2 filesystem */
|
|
|
|
|
|
#define ext2_set_bit(nr,addr) \
|
|
|
- __test_and_set_le_bit((nr), (unsigned long*)addr)
|
|
|
+ __test_and_set_bit_le((nr), (unsigned long*)addr)
|
|
|
#define ext2_clear_bit(nr, addr) \
|
|
|
- __test_and_clear_le_bit((nr), (unsigned long*)addr)
|
|
|
+ __test_and_clear_bit_le((nr), (unsigned long*)addr)
|
|
|
|
|
|
#define ext2_set_bit_atomic(lock, nr, addr) \
|
|
|
- test_and_set_le_bit((nr), (unsigned long*)addr)
|
|
|
+ test_and_set_bit_le((nr), (unsigned long*)addr)
|
|
|
#define ext2_clear_bit_atomic(lock, nr, addr) \
|
|
|
- test_and_clear_le_bit((nr), (unsigned long*)addr)
|
|
|
+ test_and_clear_bit_le((nr), (unsigned long*)addr)
|
|
|
|
|
|
-#define ext2_test_bit(nr, addr) test_le_bit((nr),(unsigned long*)addr)
|
|
|
+#define ext2_test_bit(nr, addr) test_bit_le((nr),(unsigned long*)addr)
|
|
|
|
|
|
#define ext2_find_first_zero_bit(addr, size) \
|
|
|
find_first_zero_bit_le((unsigned long*)addr, size)
|
|
@@ -334,13 +349,13 @@ unsigned long find_next_bit_le(const void *addr,
|
|
|
/* Bitmap functions for the minix filesystem. */
|
|
|
|
|
|
#define minix_test_and_set_bit(nr,addr) \
|
|
|
- __test_and_set_le_bit(nr, (unsigned long *)addr)
|
|
|
+ __test_and_set_bit_le(nr, (unsigned long *)addr)
|
|
|
#define minix_set_bit(nr,addr) \
|
|
|
- __set_le_bit(nr, (unsigned long *)addr)
|
|
|
+ __set_bit_le(nr, (unsigned long *)addr)
|
|
|
#define minix_test_and_clear_bit(nr,addr) \
|
|
|
- __test_and_clear_le_bit(nr, (unsigned long *)addr)
|
|
|
+ __test_and_clear_bit_le(nr, (unsigned long *)addr)
|
|
|
#define minix_test_bit(nr,addr) \
|
|
|
- test_le_bit(nr, (unsigned long *)addr)
|
|
|
+ test_bit_le(nr, (unsigned long *)addr)
|
|
|
|
|
|
#define minix_find_first_zero_bit(addr,size) \
|
|
|
find_first_zero_bit_le((unsigned long *)addr, size)
|