Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2aba69...
Commit: 2aba6925fdb96428d1129a61b1233597a03a387b
Parent: 77b9bd9c49442407804c37bcc82021a35277f83c
Author: Alexander van Heukelum <heukelum@mailshack.com>
AuthorDate: Tue Apr 1 17:41:26 2008 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Sat Apr 26 19:21:16 2008 +0200
x86: switch 64-bit to generic find_first_bit
Switch x86_64 to generic find_first_bit. The x86_64-specific
implementation is not removed.
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/Kconfig | 2 +-
arch/x86/lib/bitops_64.c | 2 ++
include/asm-x86/bitops_64.h | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1a69b68..7004477 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -78,7 +78,7 @@ config GENERIC_BUG
depends on BUG
config GENERIC_FIND_FIRST_BIT
- def_bool X86_32
+ def_bool y
config GENERIC_FIND_NEXT_BIT
def_bool y
diff --git a/arch/x86/lib/bitops_64.c b/arch/x86/lib/bitops_64.c
index 0eeb704..568467d 100644
--- a/arch/x86/lib/bitops_64.c
+++ b/arch/x86/lib/bitops_64.c
@@ -1,3 +1,4 @@
+#ifndef CONFIG_GENERIC_FIND_FIRST_BIT
#include <linux/bitops.h>
#undef find_first_zero_bit
@@ -105,3 +106,4 @@ long find_first_bit(const unsigned long * addr, unsigned long size)
EXPORT_SYMBOL(find_first_bit);
EXPORT_SYMBOL(find_first_zero_bit);
+#endif
diff --git a/include/asm-x86/bitops_64.h b/include/asm-x86/bitops_64.h
index d133520..4081d7e 100644
--- a/include/asm-x86/bitops_64.h
+++ b/include/asm-x86/bitops_64.h
@@ -5,6 +5,7 @@
* Copyright 1992, Linus Torvalds.
*/
+#ifndef CONFIG_GENERIC_FIND_FIRST_BIT
extern long find_first_zero_bit(const unsigned long *addr, unsigned long size);
extern long find_first_bit(const unsigned long *addr, unsigned long size);
@@ -24,6 +25,7 @@ static inline long __scanbit(unsigned long val, unsigned long max)
((__builtin_constant_p((size)) && (size) <= BITS_PER_LONG \
? (__scanbit(~*(unsigned long *)(addr), (size))) \
: find_first_zero_bit((addr), (size))))
+#endif
static inline void set_bit_string(unsigned long *bitmap, unsigned long i,
int len)
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
