diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2011-07-26 19:09:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 19:49:46 -0400 |
commit | 148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed (patch) | |
tree | 75cc7df62c9713bc1a44738026878a79653faa38 /arch/xtensa | |
parent | b2c9cd3793e5878e301ec2219785a7b8ca402ef1 (diff) |
asm-generic: add another generic ext2 atomic bitops
The majority of architectures implement ext2 atomic bitops as
test_and_{set,clear}_bit() without spinlock.
This adds this type of generic implementation in ext2-atomic-setbit.h and
use it wherever possible.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Suggested-by: Andreas Dilger <adilger@dilger.ca>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/xtensa')
-rw-r--r-- | arch/xtensa/include/asm/bitops.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/xtensa/include/asm/bitops.h b/arch/xtensa/include/asm/bitops.h index c8fac8d8190d..40aa7fe77f66 100644 --- a/arch/xtensa/include/asm/bitops.h +++ b/arch/xtensa/include/asm/bitops.h | |||
@@ -108,19 +108,7 @@ static inline unsigned long __fls(unsigned long word) | |||
108 | #include <asm-generic/bitops/find.h> | 108 | #include <asm-generic/bitops/find.h> |
109 | #include <asm-generic/bitops/le.h> | 109 | #include <asm-generic/bitops/le.h> |
110 | 110 | ||
111 | #ifdef __XTENSA_EL__ | 111 | #include <asm-generic/bitops/ext2-atomic-setbit.h> |
112 | # define ext2_set_bit_atomic(lock,nr,addr) \ | ||
113 | test_and_set_bit((nr), (unsigned long*)(addr)) | ||
114 | # define ext2_clear_bit_atomic(lock,nr,addr) \ | ||
115 | test_and_clear_bit((nr), (unsigned long*)(addr)) | ||
116 | #elif defined(__XTENSA_EB__) | ||
117 | # define ext2_set_bit_atomic(lock,nr,addr) \ | ||
118 | test_and_set_bit((nr) ^ 0x18, (unsigned long*)(addr)) | ||
119 | # define ext2_clear_bit_atomic(lock,nr,addr) \ | ||
120 | test_and_clear_bit((nr) ^ 0x18, (unsigned long*)(addr)) | ||
121 | #else | ||
122 | # error processor byte order undefined! | ||
123 | #endif | ||
124 | 112 | ||
125 | #include <asm-generic/bitops/hweight.h> | 113 | #include <asm-generic/bitops/hweight.h> |
126 | #include <asm-generic/bitops/lock.h> | 114 | #include <asm-generic/bitops/lock.h> |