Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f312eff8 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bb5cda3d

arch/alpha/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ sched_find_first_bit(const unsigned long b[2]) 
}



#include <asm-generic/bitops/le.h>

#include <asm-generic/bitops/ext2-non-atomic.h>



#define ext2_set_bit_atomic(l,n,a)   test_and_set_bit(n,a)

#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)

arch/arm/include/asm/bitops.h

+0 −7
Original line number Diff line number Diff line
@@ -339,18 +339,11 @@ static inline int find_next_bit_le(const void *p, int size, int offset) 


/*

 * Ext2 is defined to use little-endian byte ordering.

 * These do not need to be atomic.

 */

#define ext2_set_bit __test_and_set_bit_le

#define ext2_set_bit_atomic(lock, nr, p)	\

		test_and_set_bit_le(nr, p)

#define ext2_clear_bit __test_and_clear_bit_le

#define ext2_clear_bit_atomic(lock, nr, p)	\

		test_and_clear_bit_le(nr, p)

#define ext2_test_bit test_bit_le

#define ext2_find_first_zero_bit find_first_zero_bit_le

#define ext2_find_next_zero_bit find_next_zero_bit_le

#define ext2_find_next_bit find_next_bit_le



/*

 * Minix is defined to use little-endian byte ordering.

arch/avr32/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ static inline int ffs(unsigned long word) 
#include <asm-generic/bitops/lock.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-le.h>

arch/blackfin/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <asm-generic/bitops/lock.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>

arch/cris/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) 
#include <asm-generic/bitops/lock.h>



#include <asm-generic/bitops/le.h>

#include <asm-generic/bitops/ext2-non-atomic.h>



#define ext2_set_bit_atomic(l,n,a)   test_and_set_bit(n,a)

#define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)