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

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

bitops: remove minix bitops from asm/bitops.h 



minix bit operations are only used by minix filesystem and useless by
other modules.  Because byte order of inode and block bitmaps is different
on each architecture like below:

m68k:
	big-endian 16bit indexed bitmaps

h8300, microblaze, s390, sparc, m68knommu:
	big-endian 32 or 64bit indexed bitmaps

m32r, mips, sh, xtensa:
	big-endian 32 or 64bit indexed bitmaps for big-endian mode
	little-endian bitmaps for little-endian mode

Others:
	little-endian bitmaps

In order to move minix bit operations from asm/bitops.h to architecture
independent code in minix filesystem, this provides two config options.

CONFIG_MINIX_FS_BIG_ENDIAN_16BIT_INDEXED is only selected by m68k.
CONFIG_MINIX_FS_NATIVE_ENDIAN is selected by the architectures which use
native byte order bitmaps (h8300, microblaze, s390, sparc, m68knommu,
m32r, mips, sh, xtensa).  The architectures which always use little-endian
bitmaps do not select these options.

Finally, we can remove minix bit operations from asm/bitops.h for all
architectures.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Michal Simek <monstr@monstr.eu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3fca5af7

arch/alpha/include/asm/bitops.h

+0 −2
Original line number Diff line number Diff line
@@ -459,8 +459,6 @@ sched_find_first_bit(const unsigned long b[2]) 
#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)



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



#endif /* __KERNEL__ */



#endif /* _ALPHA_BITOPS_H */

arch/arm/include/asm/bitops.h

+0 −10
Original line number Diff line number Diff line
@@ -345,16 +345,6 @@ static inline int find_next_bit_le(const void *p, int size, int offset) 
#define ext2_clear_bit_atomic(lock, nr, p)	\

		test_and_clear_bit_le(nr, p)



/*

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

 * These do not need to be atomic.

 */

#define minix_set_bit __set_bit_le

#define minix_test_bit test_bit_le

#define minix_test_and_set_bit __test_and_set_bit_le

#define minix_test_and_clear_bit __test_and_clear_bit_le

#define minix_find_first_zero_bit find_first_zero_bit_le



#endif /* __KERNEL__ */



#endif /* _ARM_BITOPS_H */

arch/avr32/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -301,6 +301,5 @@ static inline int ffs(unsigned long word) 


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

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

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



#endif /* __ASM_AVR32_BITOPS_H */

arch/blackfin/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


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

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

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



#ifndef CONFIG_SMP

#include <linux/irqflags.h>

arch/cris/include/asm/bitops.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr) 
#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)



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

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



#endif /* __KERNEL__ */