summaryrefslogtreecommitdiff
path: root/include/linux/bitops.h
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2011-05-27 03:26:09 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 04:12:38 +0400
commit19de85ef574c3a2182e3ccad9581805052f14946 (patch)
tree98212bc122ac55807e562fd1ae6d0c5f0f2564d0 /include/linux/bitops.h
parenta2812e178321132811a53f7be40fe7e9bbffd9e0 (diff)
downloadlinux-19de85ef574c3a2182e3ccad9581805052f14946.tar.xz
bitops: add #ifndef for each of find bitops
The style that we normally use in asm-generic is to test the macro itself for existence, so in asm-generic, do: #ifndef find_next_zero_bit_le extern unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset); #endif and in the architectures, write static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset) #define find_next_zero_bit_le find_next_zero_bit_le This adds the #ifndef for each of the find bitops in the generic header and source files. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/bitops.h')
-rw-r--r--include/linux/bitops.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 2184c6b97aeb..4829252d7cfa 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -149,6 +149,7 @@ static inline unsigned long __ffs64(u64 word)
#ifdef __KERNEL__
#ifdef CONFIG_GENERIC_FIND_LAST_BIT
+#ifndef find_last_bit
/**
* find_last_bit - find the last set bit in a memory region
* @addr: The address to start the search at
@@ -158,6 +159,7 @@ static inline unsigned long __ffs64(u64 word)
*/
extern unsigned long find_last_bit(const unsigned long *addr,
unsigned long size);
+#endif
#endif /* CONFIG_GENERIC_FIND_LAST_BIT */
#endif /* __KERNEL__ */