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

diff --git a/include/asm-sparc/bitops.h b/include/asm-sparc/bitops.h
index 2bd40d3d14b3bed605284706a855b33c18bc4447..a0e09a70ff7882febd06ca90ddbc3889427feda3 100644 (file)
--- a/include/asm-sparc/bitops.h
+++ b/include/asm-sparc/bitops.h
@@ -479,14 +479,16 @@ found_middle:
 #define find_first_zero_le_bit(addr, size) \
         find_next_zero_le_bit((addr), (size), 0)
 
-#define ext2_set_bit                   __test_and_set_le_bit
-#define ext2_clear_bit                 __test_and_clear_le_bit
+#define ext2_set_bit(nr,addr)  \
+       __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)            \
        ({                                              \
                int ret;                                \
                spin_lock(lock);                        \
-               ret = ext2_set_bit((nr), (addr));       \
+               ret = ext2_set_bit((nr), (unsigned long *)(addr)); \
                spin_unlock(lock);                      \
                ret;                                    \
        })
@@ -495,21 +497,29 @@ found_middle:
        ({                                              \
                int ret;                                \
                spin_lock(lock);                        \
-               ret = ext2_clear_bit((nr), (addr));     \
+               ret = ext2_clear_bit((nr), (unsigned long *)(addr)); \
                spin_unlock(lock);                      \
                ret;                                    \
        })
 
-#define ext2_test_bit                  test_le_bit
-#define ext2_find_first_zero_bit       find_first_zero_le_bit
-#define ext2_find_next_zero_bit                find_next_zero_le_bit
+#define ext2_test_bit(nr,addr) \
+       test_le_bit((nr),(unsigned long *)(addr))
+#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.  */
-#define minix_test_and_set_bit(nr,addr)                test_and_set_bit(nr,addr)
-#define minix_set_bit(nr,addr)                 set_bit(nr,addr)
-#define minix_test_and_clear_bit(nr,addr)      test_and_clear_bit(nr,addr)
-#define minix_test_bit(nr,addr)                        test_bit(nr,addr)
-#define minix_find_first_zero_bit(addr,size)   find_first_zero_bit(addr,size)
+#define minix_test_and_set_bit(nr,addr)        \
+       test_and_set_bit((nr),(unsigned long *)(addr))
+#define minix_set_bit(nr,addr)         \
+       set_bit((nr),(unsigned long *)(addr))
+#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__ */