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

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

s390: introduce little-endian bitops 



Introduce little-endian bit operations by renaming native ext2 bit
operations.  The ext2 bit operations are kept as wrapper macros using
little-endian bit operations to maintain bisectability until the
conversions are finished.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f57d7ff1

arch/s390/include/asm/bitops.h

+54 −19
Original line number Original line Diff line number Diff line
@@ -742,18 +742,42 @@ static inline int sched_find_first_bit(unsigned long *b) 
 *    23 22 21 20 19 18 17 16 31 30 29 28 27 26 25 24

 *    23 22 21 20 19 18 17 16 31 30 29 28 27 26 25 24

 */

 */





#define ext2_set_bit(nr, addr)       \

static inline void __set_bit_le(unsigned long nr, void *addr)

	__test_and_set_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)

{

#define ext2_set_bit_atomic(lock, nr, addr)       \

	__set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);

	test_and_set_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)

}

#define ext2_clear_bit(nr, addr)     \



	__test_and_clear_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)

static inline void __clear_bit_le(unsigned long nr, void *addr)

#define ext2_clear_bit_atomic(lock, nr, addr)     \

{

	test_and_clear_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)

	__clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);

#define ext2_test_bit(nr, addr)      \

}

	test_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)



static inline int __test_and_set_bit_le(unsigned long nr, void *addr)

{

	return __test_and_set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);

}



static inline int test_and_set_bit_le(unsigned long nr, void *addr)

{

	return test_and_set_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);

}





static inline int ext2_find_first_zero_bit(void *vaddr, unsigned int size)

static inline int __test_and_clear_bit_le(unsigned long nr, void *addr)

{

	return __test_and_clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);

}



static inline int test_and_clear_bit_le(unsigned long nr, void *addr)

{

	return test_and_clear_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);

}



static inline int test_bit_le(unsigned long nr, const void *addr)

{

	return test_bit(nr ^ (__BITOPS_WORDSIZE - 8), addr);

}



static inline int find_first_zero_bit_le(void *vaddr, unsigned int size)

{

{

	unsigned long bytes, bits;

	unsigned long bytes, bits;
@@ -764,7 +788,7 @@ static inline int ext2_find_first_zero_bit(void *vaddr, unsigned int size) 
	return (bits < size) ? bits : size;

	return (bits < size) ? bits : size;

}

}





static inline int ext2_find_next_zero_bit(void *vaddr, unsigned long size,

static inline int find_next_zero_bit_le(void *vaddr, unsigned long size,

					  unsigned long offset)

					  unsigned long offset)

{

{

        unsigned long *addr = vaddr, *p;

        unsigned long *addr = vaddr, *p;
@@ -790,11 +814,10 @@ static inline int ext2_find_next_zero_bit(void *vaddr, unsigned long size, 
		size -= __BITOPS_WORDSIZE;

		size -= __BITOPS_WORDSIZE;

		p++;

		p++;

        }

        }

	return offset + ext2_find_first_zero_bit(p, size);

	return offset + find_first_zero_bit_le(p, size);

}

}





static inline unsigned long ext2_find_first_bit(void *vaddr,

static inline unsigned long find_first_bit_le(void *vaddr, unsigned long size)

						unsigned long size)

{

{

	unsigned long bytes, bits;

	unsigned long bytes, bits;
@@ -805,7 +828,7 @@ static inline unsigned long ext2_find_first_bit(void *vaddr, 
	return (bits < size) ? bits : size;

	return (bits < size) ? bits : size;

}

}





static inline int ext2_find_next_bit(void *vaddr, unsigned long size,

static inline int find_next_bit_le(void *vaddr, unsigned long size,

				     unsigned long offset)

				     unsigned long offset)

{

{

	unsigned long *addr = vaddr, *p;

	unsigned long *addr = vaddr, *p;
@@ -831,9 +854,21 @@ static inline int ext2_find_next_bit(void *vaddr, unsigned long size, 
		size -= __BITOPS_WORDSIZE;

		size -= __BITOPS_WORDSIZE;

		p++;

		p++;

	}

	}

	return offset + ext2_find_first_bit(p, size);

	return offset + find_first_bit_le(p, size);

}

}





#define ext2_set_bit __test_and_set_bit_le

#define ext2_set_bit_atomic(lock, nr, addr)	\

	test_and_set_bit_le(nr, addr)

#define ext2_clear_bit __test_and_clear_bit_le

#define ext2_clear_bit_atomic(lock, nr, addr)	\

	test_and_clear_bit_le(nr, addr)

#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_first_bit find_first_bit_le

#define ext2_find_next_bit find_next_bit_le



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

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





#endif /* __KERNEL__ */

#endif /* __KERNEL__ */