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 /include/asm-generic | |
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 'include/asm-generic')
-rw-r--r-- | include/asm-generic/bitops.h | 1 | ||||
-rw-r--r-- | include/asm-generic/bitops/ext2-non-atomic.h | 18 |
2 files changed, 0 insertions, 19 deletions
diff --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h index 933710b06e82..dd7c0147aecb 100644 --- a/include/asm-generic/bitops.h +++ b/include/asm-generic/bitops.h | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <asm-generic/bitops/atomic.h> | 39 | #include <asm-generic/bitops/atomic.h> |
40 | #include <asm-generic/bitops/non-atomic.h> | 40 | #include <asm-generic/bitops/non-atomic.h> |
41 | #include <asm-generic/bitops/le.h> | 41 | #include <asm-generic/bitops/le.h> |
42 | #include <asm-generic/bitops/ext2-non-atomic.h> | ||
43 | #include <asm-generic/bitops/ext2-atomic.h> | 42 | #include <asm-generic/bitops/ext2-atomic.h> |
44 | #include <asm-generic/bitops/minix.h> | 43 | #include <asm-generic/bitops/minix.h> |
45 | 44 | ||
diff --git a/include/asm-generic/bitops/ext2-non-atomic.h b/include/asm-generic/bitops/ext2-non-atomic.h deleted file mode 100644 index ad0a244787f6..000000000000 --- a/include/asm-generic/bitops/ext2-non-atomic.h +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | #ifndef _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_ | ||
2 | #define _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_ | ||
3 | |||
4 | #define ext2_set_bit(nr,addr) \ | ||
5 | __test_and_set_bit_le((nr), (unsigned long *)(addr)) | ||
6 | #define ext2_clear_bit(nr,addr) \ | ||
7 | __test_and_clear_bit_le((nr), (unsigned long *)(addr)) | ||
8 | |||
9 | #define ext2_test_bit(nr,addr) \ | ||
10 | test_bit_le((nr), (unsigned long *)(addr)) | ||
11 | #define ext2_find_first_zero_bit(addr, size) \ | ||
12 | find_first_zero_bit_le((unsigned long *)(addr), (size)) | ||
13 | #define ext2_find_next_zero_bit(addr, size, off) \ | ||
14 | find_next_zero_bit_le((unsigned long *)(addr), (size), (off)) | ||
15 | #define ext2_find_next_bit(addr, size, off) \ | ||
16 | find_next_bit_le((unsigned long *)(addr), (size), (off)) | ||
17 | |||
18 | #endif /* _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_ */ | ||