Commit 70cfcc32 authored by David S. Miller's avatar David S. Miller

[SPARC]: Fix types in ext2/minix bitops.

parent b88ea89f
...@@ -479,14 +479,16 @@ static inline unsigned long find_next_zero_le_bit(unsigned long *addr, ...@@ -479,14 +479,16 @@ static inline unsigned long find_next_zero_le_bit(unsigned long *addr,
#define find_first_zero_le_bit(addr, size) \ #define find_first_zero_le_bit(addr, size) \
find_next_zero_le_bit((addr), (size), 0) find_next_zero_le_bit((addr), (size), 0)
#define ext2_set_bit __test_and_set_le_bit #define ext2_set_bit(nr,addr) \
#define ext2_clear_bit __test_and_clear_le_bit __test_and_set_le_bit((nr),(unsigned long *)(addr))
#define ext2_clear_bit(nr,addr) \
__test_and_clear_le_bit((nr),(unsigned long *)(addr))
#define ext2_set_bit_atomic(lock, nr, addr) \ #define ext2_set_bit_atomic(lock, nr, addr) \
({ \ ({ \
int ret; \ int ret; \
spin_lock(lock); \ spin_lock(lock); \
ret = ext2_set_bit((nr), (addr)); \ ret = ext2_set_bit((nr), (unsigned long *)(addr)); \
spin_unlock(lock); \ spin_unlock(lock); \
ret; \ ret; \
}) })
...@@ -495,21 +497,29 @@ static inline unsigned long find_next_zero_le_bit(unsigned long *addr, ...@@ -495,21 +497,29 @@ static inline unsigned long find_next_zero_le_bit(unsigned long *addr,
({ \ ({ \
int ret; \ int ret; \
spin_lock(lock); \ spin_lock(lock); \
ret = ext2_clear_bit((nr), (addr)); \ ret = ext2_clear_bit((nr), (unsigned long *)(addr)); \
spin_unlock(lock); \ spin_unlock(lock); \
ret; \ ret; \
}) })
#define ext2_test_bit test_le_bit #define ext2_test_bit(nr,addr) \
#define ext2_find_first_zero_bit find_first_zero_le_bit test_le_bit((nr),(unsigned long *)(addr))
#define ext2_find_next_zero_bit find_next_zero_le_bit #define ext2_find_first_zero_bit(addr, size) \
find_first_zero_le_bit((unsigned long *)(addr), (size))
#define ext2_find_next_zero_bit(addr, size, off) \
find_next_zero_le_bit((unsigned long *)(addr), (size), (off))
/* Bitmap functions for the minix filesystem. */ /* Bitmap functions for the minix filesystem. */
#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr) #define minix_test_and_set_bit(nr,addr) \
#define minix_set_bit(nr,addr) set_bit(nr,addr) test_and_set_bit((nr),(unsigned long *)(addr))
#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr) #define minix_set_bit(nr,addr) \
#define minix_test_bit(nr,addr) test_bit(nr,addr) set_bit((nr),(unsigned long *)(addr))
#define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size) #define minix_test_and_clear_bit(nr,addr) \
test_and_clear_bit((nr),(unsigned long *)(addr))
#define minix_test_bit(nr,addr) \
test_bit((nr),(unsigned long *)(addr))
#define minix_find_first_zero_bit(addr,size) \
find_first_zero_bit((unsigned long *)(addr),(size))
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment