diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2010-09-29 05:08:51 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-09 15:51:45 -0400 |
commit | d852a6afd91fc928128f59ebff381838c365e358 (patch) | |
tree | 6afd5cb76ab2288457c56a6a458bb928cb081031 /include/linux/bitops.h | |
parent | 708ff2a0097b02d32d375b66996661f36cd4d6d1 (diff) |
bitops: remove duplicated extern declarations
If CONFIG_GENERIC_FIND_NEXT_BIT is enabled, find_next_bit() and
find_next_zero_bit() are doubly declared in asm-generic/bitops/find.h
and linux/bitops.h.
asm/bitops.h includes asm-generic/bitops/find.h if and only if the
architecture enables CONFIG_GENERIC_FIND_NEXT_BIT. And asm/bitops.h
is included by linux/bitops.h
So we can just remove the extern declarations of find_next_bit() and
find_next_zero_bit() in linux/bitops.h.
Also we can remove unneeded #ifndef CONFIG_GENERIC_FIND_NEXT_BIT in
asm-generic/bitops/find.h.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/bitops.h')
-rw-r--r-- | include/linux/bitops.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index adb0f113f571..827cc95711ef 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h | |||
@@ -149,28 +149,5 @@ extern unsigned long find_last_bit(const unsigned long *addr, | |||
149 | unsigned long size); | 149 | unsigned long size); |
150 | #endif /* CONFIG_GENERIC_FIND_LAST_BIT */ | 150 | #endif /* CONFIG_GENERIC_FIND_LAST_BIT */ |
151 | 151 | ||
152 | #ifdef CONFIG_GENERIC_FIND_NEXT_BIT | ||
153 | |||
154 | /** | ||
155 | * find_next_bit - find the next set bit in a memory region | ||
156 | * @addr: The address to base the search on | ||
157 | * @offset: The bitnumber to start searching at | ||
158 | * @size: The bitmap size in bits | ||
159 | */ | ||
160 | extern unsigned long find_next_bit(const unsigned long *addr, | ||
161 | unsigned long size, unsigned long offset); | ||
162 | |||
163 | /** | ||
164 | * find_next_zero_bit - find the next cleared bit in a memory region | ||
165 | * @addr: The address to base the search on | ||
166 | * @offset: The bitnumber to start searching at | ||
167 | * @size: The bitmap size in bits | ||
168 | */ | ||
169 | |||
170 | extern unsigned long find_next_zero_bit(const unsigned long *addr, | ||
171 | unsigned long size, | ||
172 | unsigned long offset); | ||
173 | |||
174 | #endif /* CONFIG_GENERIC_FIND_NEXT_BIT */ | ||
175 | #endif /* __KERNEL__ */ | 152 | #endif /* __KERNEL__ */ |
176 | #endif | 153 | #endif |