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

Commit b52dd007 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: Implement generic_find_next_{zero_,}le_bit() 



linux-next:
fs/udf/balloc.c: In function 'udf_bitmap_new_block':
fs/udf/balloc.c:274: error: implicit declaration of function 'generic_find_next_le_bit'

Convert ext2_find_next_{zero_,}bit() into generic_find_next_{zero_,}le_bit(),
and wrap the ext2_find_next_{zero_,}bit() around the latter.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 9881bbb2

arch/m68k/include/asm/bitops_mm.h

+8 −6
Original line number Diff line number Diff line
@@ -365,6 +365,10 @@ static inline int minix_test_bit(int nr, const void *vaddr) 
#define ext2_set_bit_atomic(lock, nr, addr)	test_and_set_bit((nr) ^ 24, (unsigned long *)(addr))

#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)

#define ext2_find_next_bit(addr, size, offset) \

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



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

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

}



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

					  unsigned offset)

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

		unsigned long size, unsigned long offset)

{

	const unsigned long *addr = vaddr;

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

	int bit = offset & 31UL, res;
@@ -437,10 +440,9 @@ static inline int ext2_find_first_bit(const void *vaddr, unsigned size) 
	return (p - addr) * 32 + res;

}



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

				     unsigned offset)

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

		unsigned long size, unsigned long offset)

{

	const unsigned long *addr = vaddr;

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

	int bit = offset & 31UL, res;