The patch titled sched: implement 180 bit sched bitmap has been removed from the -mm tree. Its filename was sched-implement-180-bit-sched-bitmap.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ Subject: sched: implement 180 bit sched bitmap From: Con Kolivas <kernel@xxxxxxxxxxx> Modify the sched_find_first_bit function to work on a 180bit long bitmap. Signed-off-by: Con Kolivas <kernel@xxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx> Cc: "Siddha, Suresh B" <suresh.b.siddha@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-generic/bitops/sched.h | 10 ++++++---- include/asm-s390/bitops.h | 12 +----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff -puN include/asm-generic/bitops/sched.h~sched-implement-180-bit-sched-bitmap include/asm-generic/bitops/sched.h --- a/include/asm-generic/bitops/sched.h~sched-implement-180-bit-sched-bitmap +++ a/include/asm-generic/bitops/sched.h @@ -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 diff -puN include/asm-s390/bitops.h~sched-implement-180-bit-sched-bitmap include/asm-s390/bitops.h --- a/include/asm-s390/bitops.h~sched-implement-180-bit-sched-bitmap +++ a/include/asm-s390/bitops.h @@ -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 <asm-generic/bitops/sched.h> #include <asm-generic/bitops/ffs.h> #include <asm-generic/bitops/fls.h> _ Patches currently in -mm which might be from kernel@xxxxxxxxxxx are sched-fix-idle-load-balancing-in-softirqd-context-fix.patch sched-implement-180-bit-sched-bitmap.patch sched-dont-renice-kernel-threads.patch sched-implement-rsdl-cpu-scheduler.patch sched-implement-rsdl-cpu-scheduler-accounting-fixes.patch sched-document-rsdl-cpu-scheduler.patch sched-add-above-background-load-function.patch mm-implement-swap-prefetching.patch swap-prefetch-avoid-repeating-entry.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html