[PATCH] bitops: use non atomic operations for minix_*_bit() and ext2_*_bit()

Bitmap functions for the minix filesystem and the ext2 filesystem except
ext2_set_bit_atomic() and ext2_clear_bit_atomic() do not require the atomic
guarantees.

But these are defined by using atomic bit operations on several architectures.
 (cris, frv, h8300, ia64, m32r, m68k, m68knommu, mips, s390, sh, sh64, sparc,
sparc64, v850, and xtensa)

This patch switches to non atomic bit operation.

Signed-off-by: Akinobu Mita <mita@miraclelinux.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/include/asm-v850/bitops.h b/include/asm-v850/bitops.h
index 609b9e87222a..44d596e792e7 100644
--- a/include/asm-v850/bitops.h
+++ b/include/asm-v850/bitops.h
@@ -336,18 +336,18 @@ static inline int sched_find_first_bit(unsigned long *b)
 #define hweight16(x)                    generic_hweight16 (x)
 #define hweight8(x)                     generic_hweight8 (x)
 
-#define ext2_set_bit                    test_and_set_bit
+#define ext2_set_bit                    __test_and_set_bit
 #define ext2_set_bit_atomic(l,n,a)      test_and_set_bit(n,a)
-#define ext2_clear_bit                  test_and_clear_bit
+#define ext2_clear_bit                  __test_and_clear_bit
 #define ext2_clear_bit_atomic(l,n,a)    test_and_clear_bit(n,a)
 #define ext2_test_bit                   test_bit
 #define ext2_find_first_zero_bit        find_first_zero_bit
 #define ext2_find_next_zero_bit         find_next_zero_bit
 
 /* Bitmap functions for the minix filesystem.  */
-#define minix_test_and_set_bit          test_and_set_bit
-#define minix_set_bit                   set_bit
-#define minix_test_and_clear_bit        test_and_clear_bit
+#define minix_test_and_set_bit          __test_and_set_bit
+#define minix_set_bit                   __set_bit
+#define minix_test_and_clear_bit        __test_and_clear_bit
 #define minix_test_bit                  test_bit
 #define minix_find_first_zero_bit       find_first_zero_bit