Modify the sched_find_first_bit function to work on a 180bit long bitmap. Remove the two architecture specific versions of this function that are not significantly different from the generic version. Signed-off-by: Con Kolivas --- include/asm-alpha/bitops.h | 21 +-------------------- include/asm-generic/bitops/sched.h | 10 ++++++---- include/asm-s390/bitops.h | 12 +----------- 3 files changed, 8 insertions(+), 35 deletions(-) Index: linux-2.6.21-rc2-mm1/include/asm-generic/bitops/sched.h =================================================================== --- linux-2.6.21-rc2-mm1.orig/include/asm-generic/bitops/sched.h 2006-11-30 08:57:37.000000000 +1100 +++ linux-2.6.21-rc2-mm1/include/asm-generic/bitops/sched.h 2007-03-06 15:23:28.000000000 +1100 @@ -6,8 +6,8 @@ /* * Every architecture must define this function. It's the fastest - * way of searching a 140-bit bitmap where the first 100 bits are - * unlikely to be set. It's guaranteed that at least one of the 140 + * way of searching a 180-bit bitmap where the first 100 bits are + * unlikely to be set. It's guaranteed that at least one of the 180 * bits is cleared. */ static inline int sched_find_first_bit(const unsigned long *b) @@ -15,7 +15,7 @@ static inline int sched_find_first_bit(c #if BITS_PER_LONG == 64 if (unlikely(b[0])) return __ffs(b[0]); - if (likely(b[1])) + if (b[1]) return __ffs(b[1]) + 64; return __ffs(b[2]) + 128; #elif BITS_PER_LONG == 32 @@ -27,7 +27,9 @@ static inline int sched_find_first_bit(c return __ffs(b[2]) + 64; if (b[3]) return __ffs(b[3]) + 96; - return __ffs(b[4]) + 128; + if (b[4]) + return __ffs(b[4]) + 128; + return __ffs(b[5]) + 160; #else #error BITS_PER_LONG not defined #endif Index: linux-2.6.21-rc2-mm1/include/asm-alpha/bitops.h =================================================================== --- linux-2.6.21-rc2-mm1.orig/include/asm-alpha/bitops.h 2006-11-30 08:57:37.000000000 +1100 +++ linux-2.6.21-rc2-mm1/include/asm-alpha/bitops.h 2007-03-06 15:23:28.000000000 +1100 @@ -366,26 +366,7 @@ static inline unsigned long hweight64(un #ifdef __KERNEL__ -/* - * Every architecture must define this function. It's the fastest - * way of searching a 140-bit bitmap where the first 100 bits are - * unlikely to be set. It's guaranteed that at least one of the 140 - * bits is set. - */ -static inline unsigned long -sched_find_first_bit(unsigned long b[3]) -{ - unsigned long b0 = b[0], b1 = b[1], b2 = b[2]; - unsigned long ofs; - - ofs = (b1 ? 64 : 128); - b1 = (b1 ? b1 : b2); - ofs = (b0 ? 0 : ofs); - b0 = (b0 ? b0 : b1); - - return __ffs(b0) + ofs; -} - +#include #include #define ext2_set_bit_atomic(l,n,a) test_and_set_bit(n,a) Index: linux-2.6.21-rc2-mm1/include/asm-s390/bitops.h =================================================================== --- linux-2.6.21-rc2-mm1.orig/include/asm-s390/bitops.h 2006-11-30 08:57:37.000000000 +1100 +++ linux-2.6.21-rc2-mm1/include/asm-s390/bitops.h 2007-03-06 15:23:28.000000000 +1100 @@ -729,17 +729,7 @@ find_next_bit (const unsigned long * add return offset + find_first_bit(p, size); } -/* - * Every architecture must define this function. It's the fastest - * way of searching a 140-bit bitmap where the first 100 bits are - * unlikely to be set. It's guaranteed that at least one of the 140 - * bits is cleared. - */ -static inline int sched_find_first_bit(unsigned long *b) -{ - return find_first_bit(b, 140); -} - +#include #include #include