1 files changed, 0 insertions, 150 deletions
diff --git a/arch/powerpc/lib/bitops.c b/arch/powerpc/lib/bitops.c
deleted file mode 100644
index f68ad71a0187..000000000000
--- a/arch/powerpc/lib/bitops.c
+++ /dev/null
@@ -1,150 +0,0 @@
-#include <linux/types.h>
-#include <linux/module.h>
-#include <asm/byteorder.h>
-#include <asm/bitops.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
- */
-unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
-                            unsigned long offset)
-{
-        const unsigned long *p = addr + BITOP_WORD(offset);
-        unsigned long result = offset & ~(BITS_PER_LONG-1);
-        unsigned long tmp;
-        if (offset >= size)
-                return size;
-        size -= result;
-        offset %= BITS_PER_LONG;
-        if (offset) {
-                tmp = *(p++);
-                tmp &= (~0UL << offset);
-                if (size < BITS_PER_LONG)
-                        goto found_first;
-                if (tmp)
-                        goto found_middle;
-                size -= BITS_PER_LONG;
-                result += BITS_PER_LONG;
-        }
-        while (size & ~(BITS_PER_LONG-1)) {
-                if ((tmp = *(p++)))
-                        goto found_middle;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-        tmp = *p;
-found_first:
-        tmp &= (~0UL >> (BITS_PER_LONG - size));
-        if (tmp == 0UL)         /* Are any bits set? */
-                return result + size;   /* Nope. */
-found_middle:
-        return result + __ffs(tmp);
-}
-EXPORT_SYMBOL(find_next_bit);
-/*
- * This implementation of find_{first,next}_zero_bit was stolen from
- * Linus' asm-alpha/bitops.h.
- */
-unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,
-                                 unsigned long offset)
-{
-        const unsigned long *p = addr + BITOP_WORD(offset);
-        unsigned long result = offset & ~(BITS_PER_LONG-1);
-        unsigned long tmp;
-        if (offset >= size)
-                return size;
-        size -= result;
-        offset %= BITS_PER_LONG;
-        if (offset) {
-                tmp = *(p++);
-                tmp |= ~0UL >> (BITS_PER_LONG - offset);
-                if (size < BITS_PER_LONG)
-                        goto found_first;
-                if (~tmp)
-                        goto found_middle;
-                size -= BITS_PER_LONG;
-                result += BITS_PER_LONG;
-        }
-        while (size & ~(BITS_PER_LONG-1)) {
-                if (~(tmp = *(p++)))
-                        goto found_middle;
-                result += BITS_PER_LONG;
-                size -= BITS_PER_LONG;
-        }
-        if (!size)
-                return result;
-        tmp = *p;
-found_first:
-        tmp |= ~0UL << size;
-        if (tmp == ~0UL)        /* Are any bits zero? */
-                return result + size;   /* Nope. */
-found_middle:
-        return result + ffz(tmp);
-}
-EXPORT_SYMBOL(find_next_zero_bit);
-static inline unsigned int ext2_ilog2(unsigned int x)
-{
-        int lz;
-        asm("cntlzw %0,%1": "=r"(lz):"r"(x));
-        return 31 - lz;
-}
-static inline unsigned int ext2_ffz(unsigned int x)
-{
-        u32 rc;
-        if ((x = ~x) == 0)
-                return 32;
-        rc = ext2_ilog2(x & -x);
-        return rc;
-}
-unsigned long find_next_zero_le_bit(const unsigned long *addr,
-                                    unsigned long size, unsigned long offset)
-{
-        const unsigned int *p = ((const unsigned int *)addr) + (offset >> 5);
-        unsigned int result = offset & ~31;
-        unsigned int tmp;
-        if (offset >= size)
-                return size;
-        size -= result;
-        offset &= 31;
-        if (offset) {
-                tmp = cpu_to_le32p(p++);
-                tmp |= ~0U >> (32 - offset);    /* bug or feature ? */
-                if (size < 32)
-                        goto found_first;
-                if (tmp != ~0)
-                        goto found_middle;
-                size -= 32;
-                result += 32;
-        }
-        while (size >= 32) {
-                if ((tmp = cpu_to_le32p(p++)) != ~0)
-                        goto found_middle;
-                result += 32;
-                size -= 32;
-        }
-        if (!size)
-                return result;
-        tmp = cpu_to_le32p(p);
-found_first:
-        tmp |= ~0 << size;
-        if (tmp == ~0)          /* Are any bits zero? */
-                return result + size;   /* Nope. */
-found_middle:
-        return result + ext2_ffz(tmp);
-}
-EXPORT_SYMBOL(find_next_zero_le_bit);

diff --git a/arch/powerpc/lib/bitops.c b/arch/powerpc/lib/bitops.c deleted file mode 100644 index f68ad71a0187..000000000000 --- a/arch/powerpc/lib/bitops.c +++ /dev/null
@@ -1,150 +0,0 @@
1	#include <linux/types.h>
2	#include <linux/module.h>
3	#include <asm/byteorder.h>
4	#include <asm/bitops.h>
5
6	/**
7	* find_next_bit - find the next set bit in a memory region
8	* @addr: The address to base the search on
9	* @offset: The bitnumber to start searching at
10	* @size: The maximum size to search
11	*/
12	unsigned long find_next_bit(const unsigned long *addr, unsigned long size,
13	unsigned long offset)
14	{
15	const unsigned long *p = addr + BITOP_WORD(offset);
16	unsigned long result = offset & ~(BITS_PER_LONG-1);
17	unsigned long tmp;
18
19	if (offset >= size)
20	return size;
21	size -= result;
22	offset %= BITS_PER_LONG;
23	if (offset) {
24	tmp = *(p++);
25	tmp &= (~0UL << offset);
26	if (size < BITS_PER_LONG)
27	goto found_first;
28	if (tmp)
29	goto found_middle;
30	size -= BITS_PER_LONG;
31	result += BITS_PER_LONG;
32	}
33	while (size & ~(BITS_PER_LONG-1)) {
34	if ((tmp = *(p++)))
35	goto found_middle;
36	result += BITS_PER_LONG;
37	size -= BITS_PER_LONG;
38	}
39	if (!size)
40	return result;
41	tmp = *p;
42
43	found_first:
44	tmp &= (~0UL >> (BITS_PER_LONG - size));
45	if (tmp == 0UL) /* Are any bits set? */
46	return result + size; /* Nope. */
47	found_middle:
48	return result + __ffs(tmp);
49	}
50	EXPORT_SYMBOL(find_next_bit);
51
52	/*
53	* This implementation of find_{first,next}_zero_bit was stolen from
54	* Linus' asm-alpha/bitops.h.
55	*/
56	unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,
57	unsigned long offset)
58	{
59	const unsigned long *p = addr + BITOP_WORD(offset);
60	unsigned long result = offset & ~(BITS_PER_LONG-1);
61	unsigned long tmp;
62
63	if (offset >= size)
64	return size;
65	size -= result;
66	offset %= BITS_PER_LONG;
67	if (offset) {
68	tmp = *(p++);
69	tmp \|= ~0UL >> (BITS_PER_LONG - offset);
70	if (size < BITS_PER_LONG)
71	goto found_first;
72	if (~tmp)
73	goto found_middle;
74	size -= BITS_PER_LONG;
75	result += BITS_PER_LONG;
76	}
77	while (size & ~(BITS_PER_LONG-1)) {
78	if (~(tmp = *(p++)))
79	goto found_middle;
80	result += BITS_PER_LONG;
81	size -= BITS_PER_LONG;
82	}
83	if (!size)
84	return result;
85	tmp = *p;
86
87	found_first:
88	tmp \|= ~0UL << size;
89	if (tmp == ~0UL) /* Are any bits zero? */
90	return result + size; /* Nope. */
91	found_middle:
92	return result + ffz(tmp);
93	}
94	EXPORT_SYMBOL(find_next_zero_bit);
95
96	static inline unsigned int ext2_ilog2(unsigned int x)
97	{
98	int lz;
99
100	asm("cntlzw %0,%1": "=r"(lz):"r"(x));
101	return 31 - lz;
102	}
103
104	static inline unsigned int ext2_ffz(unsigned int x)
105	{
106	u32 rc;
107	if ((x = ~x) == 0)
108	return 32;
109	rc = ext2_ilog2(x & -x);
110	return rc;
111	}
112
113	unsigned long find_next_zero_le_bit(const unsigned long *addr,
114	unsigned long size, unsigned long offset)
115	{
116	const unsigned int p = ((const unsigned int )addr) + (offset >> 5);
117	unsigned int result = offset & ~31;
118	unsigned int tmp;
119
120	if (offset >= size)
121	return size;
122	size -= result;
123	offset &= 31;
124	if (offset) {
125	tmp = cpu_to_le32p(p++);
126	tmp \|= ~0U >> (32 - offset); /* bug or feature ? */
127	if (size < 32)
128	goto found_first;
129	if (tmp != ~0)
130	goto found_middle;
131	size -= 32;
132	result += 32;
133	}
134	while (size >= 32) {
135	if ((tmp = cpu_to_le32p(p++)) != ~0)
136	goto found_middle;
137	result += 32;
138	size -= 32;
139	}
140	if (!size)
141	return result;
142	tmp = cpu_to_le32p(p);
143	found_first:
144	tmp \|= ~0 << size;
145	if (tmp == ~0) /* Are any bits zero? */
146	return result + size; /* Nope. */
147	found_middle:
148	return result + ext2_ffz(tmp);
149	}
150	EXPORT_SYMBOL(find_next_zero_le_bit);