diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2011-03-23 19:42:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 22:46:21 -0400 |
commit | f312eff8164879e04923d41e9dd23e7850937d85 (patch) | |
tree | 9f4f6fd00ebf12afd5b070c44d12b55a29440360 /arch/m68k | |
parent | bb5cda3d706f44e5696533c9a7353c458f2871e0 (diff) |
bitops: remove ext2 non-atomic bitops from asm/bitops.h
As the result of conversions, there are no users of ext2 non-atomic bit
operations except for ext2 filesystem itself. Now we can put them into
architecture independent code in ext2 filesystem, and remove from
asm/bitops.h for all architectures.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/bitops_mm.h | 7 | ||||
-rw-r--r-- | arch/m68k/include/asm/bitops_no.h | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/m68k/include/asm/bitops_mm.h b/arch/m68k/include/asm/bitops_mm.h index d4658487defd..3d16871402ad 100644 --- a/arch/m68k/include/asm/bitops_mm.h +++ b/arch/m68k/include/asm/bitops_mm.h | |||
@@ -490,17 +490,10 @@ static inline unsigned long find_next_bit_le(const void *addr, | |||
490 | 490 | ||
491 | /* Bitmap functions for the ext2 filesystem. */ | 491 | /* Bitmap functions for the ext2 filesystem. */ |
492 | 492 | ||
493 | #define ext2_set_bit __test_and_set_bit_le | ||
494 | #define ext2_set_bit_atomic(lock, nr, addr) \ | 493 | #define ext2_set_bit_atomic(lock, nr, addr) \ |
495 | test_and_set_bit_le(nr, addr) | 494 | test_and_set_bit_le(nr, addr) |
496 | #define ext2_clear_bit __test_and_clear_bit_le | ||
497 | #define ext2_clear_bit_atomic(lock, nr, addr) \ | 495 | #define ext2_clear_bit_atomic(lock, nr, addr) \ |
498 | test_and_clear_bit_le(nr, addr) | 496 | test_and_clear_bit_le(nr, addr) |
499 | #define ext2_find_next_zero_bit find_next_zero_bit_le | ||
500 | #define ext2_find_next_bit find_next_bit_le | ||
501 | #define ext2_test_bit test_bit_le | ||
502 | #define ext2_find_first_zero_bit find_first_zero_bit_le | ||
503 | #define ext2_find_first_bit find_first_bit_le | ||
504 | 497 | ||
505 | #endif /* __KERNEL__ */ | 498 | #endif /* __KERNEL__ */ |
506 | 499 | ||
diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h index 74b3f81f2e21..8db5fef8631f 100644 --- a/arch/m68k/include/asm/bitops_no.h +++ b/arch/m68k/include/asm/bitops_no.h | |||
@@ -336,13 +336,6 @@ found_middle: | |||
336 | return result + ffz(__swab32(tmp)); | 336 | return result + ffz(__swab32(tmp)); |
337 | } | 337 | } |
338 | 338 | ||
339 | #define ext2_set_bit __test_and_set_bit_le | ||
340 | #define ext2_clear_bit __test_and_clear_bit_le | ||
341 | #define ext2_test_bit test_bit_le | ||
342 | #define ext2_find_first_zero_bit find_first_zero_bit_le | ||
343 | #define ext2_find_next_zero_bit find_next_zero_bit_le | ||
344 | #define ext2_find_next_bit find_next_bit_le | ||
345 | |||
346 | #include <asm-generic/bitops/minix.h> | 339 | #include <asm-generic/bitops/minix.h> |
347 | 340 | ||
348 | #endif /* __KERNEL__ */ | 341 | #endif /* __KERNEL__ */ |