From 2393e640405734dfd70f1fb7085bef53bee2fd21 Mon Sep 17 00:00:00 2001
From: Mike Galbraith <efault@gmx.de>
Date: Mon, 9 Jul 2007 18:52:00 +0200
Subject: [PATCH] --- yaml --- r: 58301 b: refs/heads/master c:
 ff80a77f20f811c0cc5b251d0f657cbc6f788385 h: refs/heads/master i:   58299:
 3eeb84201a348d04bd987f1c476b88622a47ebd5 v: v3

---
 [refs]                                   |  2 +-
 trunk/include/asm-generic/bitops/sched.h | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 1352cf109a9f..98a5c79979da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e7eaade55d53da856f0e07dc9c188f78f780192
+refs/heads/master: ff80a77f20f811c0cc5b251d0f657cbc6f788385
diff --git a/trunk/include/asm-generic/bitops/sched.h b/trunk/include/asm-generic/bitops/sched.h
index 815bb0148060..604fab7031a6 100644
--- a/trunk/include/asm-generic/bitops/sched.h
+++ b/trunk/include/asm-generic/bitops/sched.h
@@ -6,28 +6,23 @@
 
 /*
  * 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.
+ * way of searching a 100-bit bitmap.  It's guaranteed that at least
+ * one of the 100 bits is cleared.
  */
 static inline int sched_find_first_bit(const unsigned long *b)
 {
 #if BITS_PER_LONG == 64
-	if (unlikely(b[0]))
+	if (b[0])
 		return __ffs(b[0]);
-	if (likely(b[1]))
-		return __ffs(b[1]) + 64;
-	return __ffs(b[2]) + 128;
+	return __ffs(b[1]) + 64;
 #elif BITS_PER_LONG == 32
-	if (unlikely(b[0]))
+	if (b[0])
 		return __ffs(b[0]);
-	if (unlikely(b[1]))
+	if (b[1])
 		return __ffs(b[1]) + 32;
-	if (unlikely(b[2]))
+	if (b[2])
 		return __ffs(b[2]) + 64;
-	if (b[3])
-		return __ffs(b[3]) + 96;
-	return __ffs(b[4]) + 128;
+	return __ffs(b[3]) + 96;
 #else
 #error BITS_PER_LONG not defined
 #endif