diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2011-03-23 16:42:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 19:46:21 -0700 |
| commit | f312eff8164879e04923d41e9dd23e7850937d85 (patch) | |
| tree | 9f4f6fd00ebf12afd5b070c44d12b55a29440360 /arch/sparc | |
| parent | bb5cda3d706f44e5696533c9a7353c458f2871e0 (diff) | |
| download | kernel-common-f312eff8164879e04923d41e9dd23e7850937d85.tar.gz kernel-common-f312eff8164879e04923d41e9dd23e7850937d85.tar.bz2 kernel-common-f312eff8164879e04923d41e9dd23e7850937d85.zip | |
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/sparc')
| -rw-r--r-- | arch/sparc/include/asm/bitops_32.h | 1 | ||||
| -rw-r--r-- | arch/sparc/include/asm/bitops_64.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/bitops_32.h b/arch/sparc/include/asm/bitops_32.h index 5b3ab0646587..75da6f82a12e 100644 --- a/arch/sparc/include/asm/bitops_32.h +++ b/arch/sparc/include/asm/bitops_32.h @@ -104,7 +104,6 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) #include <asm-generic/bitops/lock.h> #include <asm-generic/bitops/find.h> #include <asm-generic/bitops/le.h> -#include <asm-generic/bitops/ext2-non-atomic.h> #include <asm-generic/bitops/ext2-atomic.h> #include <asm-generic/bitops/minix.h> diff --git a/arch/sparc/include/asm/bitops_64.h b/arch/sparc/include/asm/bitops_64.h index 9097862faaad..66db28e6bbf5 100644 --- a/arch/sparc/include/asm/bitops_64.h +++ b/arch/sparc/include/asm/bitops_64.h @@ -90,7 +90,6 @@ static inline unsigned int __arch_hweight8(unsigned int w) #ifdef __KERNEL__ #include <asm-generic/bitops/le.h> -#include <asm-generic/bitops/ext2-non-atomic.h> #define ext2_set_bit_atomic(lock,nr,addr) \ test_and_set_bit((nr) ^ 0x38,(unsigned long *)(addr)) |