arch: add #define for each of optimized find bitops
The style that we normally use in asm-generic is to test the macro itself for existence, so in asm-generic, do: #ifndef find_next_zero_bit_le extern unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset); #endif and in the architectures, write static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset) #define find_next_zero_bit_le find_next_zero_bit_le This adds the #define for each of the optimized find bitops in the architectures. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Ungerer <gerg@uclinux.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
e0819410db
commit
a2812e1783
@@ -200,6 +200,7 @@ out:
|
||||
res += ((long)p - (long)vaddr - 4) * 8;
|
||||
return res < size ? res : size;
|
||||
}
|
||||
#define find_first_zero_bit find_first_zero_bit
|
||||
|
||||
static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
|
||||
int offset)
|
||||
@@ -229,6 +230,7 @@ static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
|
||||
/* No zero yet, search remaining full bytes for a zero */
|
||||
return offset + find_first_zero_bit(p, size - offset);
|
||||
}
|
||||
#define find_next_zero_bit find_next_zero_bit
|
||||
|
||||
static inline int find_first_bit(const unsigned long *vaddr, unsigned size)
|
||||
{
|
||||
@@ -253,6 +255,7 @@ out:
|
||||
res += ((long)p - (long)vaddr - 4) * 8;
|
||||
return res < size ? res : size;
|
||||
}
|
||||
#define find_first_bit find_first_bit
|
||||
|
||||
static inline int find_next_bit(const unsigned long *vaddr, int size,
|
||||
int offset)
|
||||
@@ -282,6 +285,7 @@ static inline int find_next_bit(const unsigned long *vaddr, int size,
|
||||
/* No one yet, search remaining full bytes for a one */
|
||||
return offset + find_first_bit(p, size - offset);
|
||||
}
|
||||
#define find_next_bit find_next_bit
|
||||
|
||||
/*
|
||||
* ffz = Find First Zero in word. Undefined if no zero exists,
|
||||
@@ -398,6 +402,7 @@ out:
|
||||
res += (p - addr) * 32;
|
||||
return res < size ? res : size;
|
||||
}
|
||||
#define find_first_zero_bit_le find_first_zero_bit_le
|
||||
|
||||
static inline unsigned long find_next_zero_bit_le(const void *addr,
|
||||
unsigned long size, unsigned long offset)
|
||||
@@ -427,6 +432,7 @@ static inline unsigned long find_next_zero_bit_le(const void *addr,
|
||||
/* No zero yet, search remaining full bytes for a zero */
|
||||
return offset + find_first_zero_bit_le(p, size - offset);
|
||||
}
|
||||
#define find_next_zero_bit_le find_next_zero_bit_le
|
||||
|
||||
static inline int find_first_bit_le(const void *vaddr, unsigned size)
|
||||
{
|
||||
@@ -451,6 +457,7 @@ out:
|
||||
res += (p - addr) * 32;
|
||||
return res < size ? res : size;
|
||||
}
|
||||
#define find_first_bit_le find_first_bit_le
|
||||
|
||||
static inline unsigned long find_next_bit_le(const void *addr,
|
||||
unsigned long size, unsigned long offset)
|
||||
@@ -480,6 +487,7 @@ static inline unsigned long find_next_bit_le(const void *addr,
|
||||
/* No set bit yet, search remaining full bytes for a set bit */
|
||||
return offset + find_first_bit_le(p, size - offset);
|
||||
}
|
||||
#define find_next_bit_le find_next_bit_le
|
||||
|
||||
/* Bitmap functions for the ext2 filesystem. */
|
||||
|
||||
|
||||
@@ -319,6 +319,7 @@ found_first:
|
||||
found_middle:
|
||||
return result + ffz(__swab32(tmp));
|
||||
}
|
||||
#define find_next_zero_bit_le find_next_zero_bit_le
|
||||
|
||||
static inline unsigned long find_next_bit_le(const void *addr, unsigned
|
||||
long size, unsigned long offset)
|
||||
@@ -363,6 +364,7 @@ found_middle:
|
||||
found_middle_swap:
|
||||
return result + __ffs(__swab32(tmp));
|
||||
}
|
||||
#define find_next_bit_le find_next_bit_le
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user