aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--arch/x86/lib/bitops_64.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1a69b68ff6cc..700447738e73 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -78,7 +78,7 @@ config GENERIC_BUG
78 depends on BUG 78 depends on BUG
79 79
80config GENERIC_FIND_FIRST_BIT 80config GENERIC_FIND_FIRST_BIT
81 def_bool X86_32 81 def_bool y
82 82
83config GENERIC_FIND_NEXT_BIT 83config GENERIC_FIND_NEXT_BIT
84 def_bool y 84 def_bool y
diff --git a/arch/x86/lib/bitops_64.c b/arch/x86/lib/bitops_64.c
index 0eeb704d2513..568467d390c0 100644
--- a/arch/x86/lib/bitops_64.c
+++ b/arch/x86/lib/bitops_64.c
@@ -1,3 +1,4 @@
1#ifndef CONFIG_GENERIC_FIND_FIRST_BIT
1#include <linux/bitops.h> 2#include <linux/bitops.h>
2 3
3#undef find_first_zero_bit 4#undef find_first_zero_bit
@@ -105,3 +106,4 @@ long find_first_bit(const unsigned long * addr, unsigned long size)
105 106
106EXPORT_SYMBOL(find_first_bit); 107EXPORT_SYMBOL(find_first_bit);
107EXPORT_SYMBOL(find_first_zero_bit); 108EXPORT_SYMBOL(find_first_zero_bit);
109#endif