Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-generic-bitops-v3

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-generic-bitops-v3:
  x86, bitops: select the generic bitmap search functions
  x86: include/asm-x86/pgalloc.h/bitops.h: checkpatch cleanups - formatting only
  x86: finalize bitops unification
  x86, UML: remove x86-specific implementations of find_first_bit
  x86: optimize find_first_bit for small bitmaps
  x86: switch 64-bit to generic find_first_bit
  x86: generic versions of find_first_(zero_)bit, convert i386
  bitops: use __fls for fls64 on 64-bit archs
  generic: implement __fls on all 64-bit archs
  generic: introduce a generic __fls implementation
  x86: merge the simple bitops and move them to bitops.h
  x86, generic: optimize find_next_(zero_)bit for small constant-size bitmaps
  x86, uml: fix uml with generic find_next_bit for x86
  x86: change x86 to use generic find_next_bit
  uml: Kconfig cleanup
  uml: fix build error

1 files changed, 0 insertions, 70 deletions

diff --git a/arch/x86/lib/bitops_32.c b/arch/x86/lib/bitops_32.c
deleted file mode 100644
index b65440459859..000000000000
--- a/arch/x86/lib/bitops_32.c
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <linux/bitops.h>
-#include <linux/module.h>
-
-/**
- * find_next_bit - find the next set bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The maximum size to search
- */
-int find_next_bit(const unsigned long *addr, int size, int offset)
-{
-        const unsigned long *p = addr + (offset >> 5);
-        int set = 0, bit = offset & 31, res;
-
-        if (bit) {
-                /*
-                 * Look for nonzero in the first 32 bits:
-                 */
-                __asm__("bsfl %1,%0\n\t"
-                        "jne 1f\n\t"
-                        "movl $32, %0\n"
-                        "1:"
-                        : "=r" (set)
-                        : "r" (*p >> bit));
-                if (set < (32 - bit))
-                        return set + offset;
-                set = 32 - bit;
-                p++;
-        }
-        /*
-         * No set bit yet, search remaining full words for a bit
-         */
-        res = find_first_bit (p, size - 32 * (p - addr));
-        return (offset + set + res);
-}
-EXPORT_SYMBOL(find_next_bit);
-
-/**
- * find_next_zero_bit - find the first zero bit in a memory region
- * @addr: The address to base the search on
- * @offset: The bitnumber to start searching at
- * @size: The maximum size to search
- */
-int find_next_zero_bit(const unsigned long *addr, int size, int offset)
-{
-        const unsigned long *p = addr + (offset >> 5);
-        int set = 0, bit = offset & 31, res;
-
-        if (bit) {
-                /*
-                 * Look for zero in the first 32 bits.
-                 */
-                __asm__("bsfl %1,%0\n\t"
-                        "jne 1f\n\t"
-                        "movl $32, %0\n"
-                        "1:"
-                        : "=r" (set)
-                        : "r" (~(*p >> bit)));
-                if (set < (32 - bit))
-                        return set + offset;
-                set = 32 - bit;
-                p++;
-        }
-        /*
-         * No zero yet, search remaining full bytes for a zero
-         */
-        res = find_first_zero_bit(p, size - 32 * (p - addr));
-        return (offset + set + res);
-}
-EXPORT_SYMBOL(find_next_zero_bit);