summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2011-03-23 16:42:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 19:46:21 -0700
commitf312eff8164879e04923d41e9dd23e7850937d85 (patch)
tree9f4f6fd00ebf12afd5b070c44d12b55a29440360 /arch/x86
parentbb5cda3d706f44e5696533c9a7353c458f2871e0 (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/x86')
-rw-r--r--arch/x86/include/asm/bitops.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index c68bc101441d..3c95e072c179 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -457,7 +457,6 @@ static inline int fls(int x)
#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), (unsigned long *)(addr))