From: Akinobu Mita Date: Sun, 17 Apr 2011 13:57:29 +0000 (+0900) Subject: m68knommu: use asm-generic/bitops/ext2-atomic.h X-Git-Tag: firefly_0821_release~7613^2~1308^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48e1328e06dd9bd7a4932ee47428475963ea55b0;p=firefly-linux-kernel-4.4.55.git m68knommu: use asm-generic/bitops/ext2-atomic.h m68knommu can use generic implementation of ext2 atomic bitops. Signed-off-by: Akinobu Mita Signed-off-by: Greg Ungerer --- diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h index 7d3779fdc5b6..6b0e2d349f0e 100644 --- a/arch/m68k/include/asm/bitops_no.h +++ b/arch/m68k/include/asm/bitops_no.h @@ -246,23 +246,7 @@ static inline int __test_and_clear_bit_le(int nr, volatile void *addr) return retval; } -#define ext2_set_bit_atomic(lock, nr, addr) \ - ({ \ - int ret; \ - spin_lock(lock); \ - ret = __test_and_set_bit_le((nr), (addr)); \ - spin_unlock(lock); \ - ret; \ - }) - -#define ext2_clear_bit_atomic(lock, nr, addr) \ - ({ \ - int ret; \ - spin_lock(lock); \ - ret = __test_and_clear_bit_le((nr), (addr)); \ - spin_unlock(lock); \ - ret; \ - }) +#include static inline int test_bit_le(int nr, const volatile void *addr) {