From 1c9224489a0bd4d965e49e0a3c52048298c769a3 Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Date: Thu, 12 Jun 2008 15:21:29 -0700
Subject: [PATCH] --- yaml --- r: 98047 b: refs/heads/master c:
 69c5ddf58a03da3686691ad2f293bc79fd977c10 h: refs/heads/master i:   98045:
 f65e11c524b392027892bb95fe3b8c8a8b5dbcb7   98043:
 b35f15072e7e0c060bcdd9a0c7d3344e44796ebf   98039:
 2b45147db88543ee92607b16336edf8243273e71   98031:
 06819f09fe14bbcce2949499e0e100308d362ac9   98015:
 d5a0bb7128b548321e48238c6a4adcccd6d3dc30   97983:
 db5a2bcc4eac76bbe2862b36b064460d58fe1eea   97919:
 cce120f8f117881f80ef18d2e1bf59c0df587c1a   97791:
 9c65fb13770b628b572c6a470c072768f060ec91 v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-m68k/bitops.h | 45 +++++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6af88c863068..98d95d538e74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d518f84e5ecd1d71df0e6ac5176d212f68c27ce
+refs/heads/master: 69c5ddf58a03da3686691ad2f293bc79fd977c10
diff --git a/trunk/include/asm-m68k/bitops.h b/trunk/include/asm-m68k/bitops.h
index 83d1f286230b..3e8106442d5a 100644
--- a/trunk/include/asm-m68k/bitops.h
+++ b/trunk/include/asm-m68k/bitops.h
@@ -410,8 +410,49 @@ static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size,
 	res = ext2_find_first_zero_bit (p, size - 32 * (p - addr));
 	return (p - addr) * 32 + res;
 }
-#define ext2_find_next_bit(addr, size, off) \
-	generic_find_next_le_bit((unsigned long *)(addr), (size), (off))
+
+static inline int ext2_find_first_bit(const void *vaddr, unsigned size)
+{
+	const unsigned long *p = vaddr, *addr = vaddr;
+	int res;
+
+	if (!size)
+		return 0;
+
+	size = (size >> 5) + ((size & 31) > 0);
+	while (*p++ == 0UL) {
+		if (--size == 0)
+			return (p - addr) << 5;
+	}
+
+	--p;
+	for (res = 0; res < 32; res++)
+		if (ext2_test_bit(res, p))
+			break;
+	return (p - addr) * 32 + res;
+}
+
+static inline int ext2_find_next_bit(const void *vaddr, unsigned size,
+				     unsigned offset)
+{
+	const unsigned long *addr = vaddr;
+	const unsigned long *p = addr + (offset >> 5);
+	int bit = offset & 31UL, res;
+
+	if (offset >= size)
+		return size;
+
+	if (bit) {
+		/* Look for one in first longword */
+		for (res = bit; res < 32; res++)
+			if (ext2_test_bit(res, p))
+				return (p - addr) * 32 + res;
+		p++;
+	}
+	/* No set bit yet, search remaining full bytes for a set bit */
+	res = ext2_find_first_bit(p, size - 32 * (p - addr));
+	return (p - addr) * 32 + res;
+}
 
 #endif /* __KERNEL__ */