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

asm-generic: rename generic little-endian bitops functions 



As a preparation for providing little-endian bitops for all architectures,
This renames generic implementation of little-endian bitops.  (remove
"generic_" prefix and postfix "_le")

s/generic_find_next_le_bit/find_next_bit_le/
s/generic_find_next_zero_le_bit/find_next_zero_bit_le/
s/generic_find_first_zero_le_bit/find_first_zero_bit_le/
s/generic___test_and_set_le_bit/__test_and_set_bit_le/
s/generic___test_and_clear_le_bit/__test_and_clear_bit_le/
s/generic_test_le_bit/test_bit_le/
s/generic___set_le_bit/__set_bit_le/
s/generic___clear_le_bit/__clear_bit_le/
s/generic_test_and_set_le_bit/test_and_set_bit_le/
s/generic_test_and_clear_le_bit/test_and_clear_bit_le/

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 63ab595f

arch/avr32/kernel/avr32_ksyms.c

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ EXPORT_SYMBOL(find_first_zero_bit); 
EXPORT_SYMBOL(find_next_zero_bit);

EXPORT_SYMBOL(find_first_bit);

EXPORT_SYMBOL(find_next_bit);

EXPORT_SYMBOL(generic_find_next_le_bit);

EXPORT_SYMBOL(generic_find_next_zero_le_bit);

EXPORT_SYMBOL(find_next_bit_le);

EXPORT_SYMBOL(find_next_zero_bit_le);



/* I/O primitives (lib/io-*.S) */

EXPORT_SYMBOL(__raw_readsb);

arch/avr32/lib/findbit.S

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ ENTRY(find_next_bit) 
	brgt	1b

	retal	r11



ENTRY(generic_find_next_le_bit)

ENTRY(find_next_bit_le)

	lsr	r8, r10, 5

	sub	r9, r11, r10

	retle	r11
@@ -153,7 +153,7 @@ ENTRY(generic_find_next_le_bit) 
	brgt	1b

	retal	r11



ENTRY(generic_find_next_zero_le_bit)

ENTRY(find_next_zero_bit_le)

	lsr	r8, r10, 5

	sub	r9, r11, r10

	retle	r11

arch/m68k/include/asm/bitops_mm.h

+4 −4
Original line number Diff line number Diff line
@@ -366,9 +366,9 @@ static inline int minix_test_bit(int nr, const void *vaddr) 
#define ext2_clear_bit(nr, addr)		__test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))

#define ext2_clear_bit_atomic(lock, nr, addr)	test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))

#define ext2_find_next_zero_bit(addr, size, offset) \

	generic_find_next_zero_le_bit((unsigned long *)addr, size, offset)

	find_next_zero_bit_le((unsigned long *)addr, size, offset)

#define ext2_find_next_bit(addr, size, offset) \

	generic_find_next_le_bit((unsigned long *)addr, size, offset)

	find_next_bit_le((unsigned long *)addr, size, offset)



static inline int ext2_test_bit(int nr, const void *vaddr)

{
@@ -398,7 +398,7 @@ static inline int ext2_find_first_zero_bit(const void *vaddr, unsigned size) 
	return (p - addr) * 32 + res;

}



static inline unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,

static inline unsigned long find_next_zero_bit_le(const unsigned long *addr,

		unsigned long size, unsigned long offset)

{

	const unsigned long *p = addr + (offset >> 5);
@@ -440,7 +440,7 @@ static inline int ext2_find_first_bit(const void *vaddr, unsigned size) 
	return (p - addr) * 32 + res;

}



static inline unsigned long generic_find_next_le_bit(const unsigned long *addr,

static inline unsigned long find_next_bit_le(const unsigned long *addr,

		unsigned long size, unsigned long offset)

{

	const unsigned long *p = addr + (offset >> 5);

arch/m68k/include/asm/bitops_no.h

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ found_middle: 
}



#define ext2_find_next_bit(addr, size, off) \

	generic_find_next_le_bit((unsigned long *)(addr), (size), (off))

	find_next_bit_le((unsigned long *)(addr), (size), (off))

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



#endif /* __KERNEL__ */

arch/powerpc/include/asm/bitops.h

+8 −7
Original line number Diff line number Diff line
@@ -303,11 +303,12 @@ static __inline__ int test_le_bit(unsigned long nr, 
#define __test_and_clear_le_bit(nr, addr) \

	__test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))



#define find_first_zero_le_bit(addr, size) generic_find_next_zero_le_bit((addr), (size), 0)

unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,

#define find_first_zero_bit_le(addr, size) \

	find_next_zero_bit_le((addr), (size), 0)

unsigned long find_next_zero_bit_le(const unsigned long *addr,

				    unsigned long size, unsigned long offset);



unsigned long generic_find_next_le_bit(const unsigned long *addr,

unsigned long find_next_bit_le(const unsigned long *addr,

				    unsigned long size, unsigned long offset);

/* Bitmap functions for the ext2 filesystem */
@@ -324,12 +325,12 @@ unsigned long generic_find_next_le_bit(const unsigned long *addr, 
#define ext2_test_bit(nr, addr)      test_le_bit((nr),(unsigned long*)addr)



#define ext2_find_first_zero_bit(addr, size) \

	find_first_zero_le_bit((unsigned long*)addr, size)

	find_first_zero_bit_le((unsigned long*)addr, size)

#define ext2_find_next_zero_bit(addr, size, off) \

	generic_find_next_zero_le_bit((unsigned long*)addr, size, off)

	find_next_zero_bit_le((unsigned long *)addr, size, off)



#define ext2_find_next_bit(addr, size, off) \

	generic_find_next_le_bit((unsigned long *)addr, size, off)

	find_next_bit_le((unsigned long *)addr, size, off)

/* Bitmap functions for the minix filesystem.  */



#define minix_test_and_set_bit(nr,addr) \
@@ -342,7 +343,7 @@ unsigned long generic_find_next_le_bit(const unsigned long *addr, 
	test_le_bit(nr, (unsigned long *)addr)



#define minix_find_first_zero_bit(addr,size) \

	find_first_zero_le_bit((unsigned long *)addr, size)

	find_first_zero_bit_le((unsigned long *)addr, size)



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE