Commit 63e424c8 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds

arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT}

By the previous style change, CONFIG_GENERIC_FIND_NEXT_BIT,
CONFIG_GENERIC_FIND_BIT_LE, and CONFIG_GENERIC_FIND_LAST_BIT are not used
to test for existence of find bitops anymore.
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 19de85ef
...@@ -41,10 +41,6 @@ config ARCH_HAS_ILOG2_U64 ...@@ -41,10 +41,6 @@ config ARCH_HAS_ILOG2_U64
bool bool
default n default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
......
...@@ -47,9 +47,6 @@ config GENERIC_BUG ...@@ -47,9 +47,6 @@ config GENERIC_BUG
config ZONE_DMA config ZONE_DMA
def_bool y def_bool y
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_GPIO config GENERIC_GPIO
def_bool y def_bool y
......
...@@ -31,10 +31,6 @@ config ARCH_HAS_ILOG2_U64 ...@@ -31,10 +31,6 @@ config ARCH_HAS_ILOG2_U64
bool bool
default n default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
bool bool
default y default y
......
...@@ -19,14 +19,6 @@ config RWSEM_GENERIC_SPINLOCK ...@@ -19,14 +19,6 @@ config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM config RWSEM_XCHGADD_ALGORITHM
bool bool
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
bool bool
default y default y
......
...@@ -41,14 +41,6 @@ config ARCH_HAS_ILOG2_U64 ...@@ -41,14 +41,6 @@ config ARCH_HAS_ILOG2_U64
bool bool
default n default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
bool bool
default y default y
......
...@@ -78,10 +78,6 @@ config HUGETLB_PAGE_SIZE_VARIABLE ...@@ -78,10 +78,6 @@ config HUGETLB_PAGE_SIZE_VARIABLE
depends on HUGETLB_PAGE depends on HUGETLB_PAGE
default y default y
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
......
...@@ -256,14 +256,6 @@ config ARCH_HAS_ILOG2_U64 ...@@ -256,14 +256,6 @@ config ARCH_HAS_ILOG2_U64
bool bool
default n default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
bool bool
default y default y
......
...@@ -2,10 +2,6 @@ config FPU ...@@ -2,10 +2,6 @@ config FPU
bool bool
default n default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_GPIO config GENERIC_GPIO
bool bool
default n default n
......
...@@ -33,12 +33,6 @@ config ARCH_HAS_ILOG2_U32 ...@@ -33,12 +33,6 @@ config ARCH_HAS_ILOG2_U32
config ARCH_HAS_ILOG2_U64 config ARCH_HAS_ILOG2_U64
def_bool n def_bool n
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_FIND_BIT_LE
def_bool y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
def_bool y def_bool y
......
...@@ -821,14 +821,6 @@ config ARCH_SUPPORTS_OPROFILE ...@@ -821,14 +821,6 @@ config ARCH_SUPPORTS_OPROFILE
bool bool
default y if !MIPS_MT_SMTC default y if !MIPS_MT_SMTC
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
bool bool
default y default y
......
...@@ -44,9 +44,6 @@ config GENERIC_CALIBRATE_DELAY ...@@ -44,9 +44,6 @@ config GENERIC_CALIBRATE_DELAY
config GENERIC_CMOS_UPDATE config GENERIC_CMOS_UPDATE
def_bool n def_bool n
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
def_bool y def_bool y
......
...@@ -47,14 +47,6 @@ config ARCH_HAS_ILOG2_U64 ...@@ -47,14 +47,6 @@ config ARCH_HAS_ILOG2_U64
bool bool
default n default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_BUG config GENERIC_BUG
bool bool
default y default y
......
...@@ -91,14 +91,6 @@ config GENERIC_HWEIGHT ...@@ -91,14 +91,6 @@ config GENERIC_HWEIGHT
bool bool
default y default y
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_GPIO config GENERIC_GPIO
bool bool
help help
......
...@@ -43,9 +43,6 @@ config NO_DMA ...@@ -43,9 +43,6 @@ config NO_DMA
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
def_bool y def_bool y
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
def_bool y def_bool y
......
...@@ -71,12 +71,6 @@ config GENERIC_CSUM ...@@ -71,12 +71,6 @@ config GENERIC_CSUM
def_bool y def_bool y
depends on SUPERH64 depends on SUPERH64
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_FIND_BIT_LE
def_bool y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
def_bool y def_bool y
......
...@@ -190,14 +190,6 @@ config RWSEM_XCHGADD_ALGORITHM ...@@ -190,14 +190,6 @@ config RWSEM_XCHGADD_ALGORITHM
bool bool
default y if SPARC64 default y if SPARC64
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
bool bool
default y if !ULTRA_HAS_POPULATION_COUNT default y if !ULTRA_HAS_POPULATION_COUNT
......
...@@ -5,7 +5,6 @@ config TILE ...@@ -5,7 +5,6 @@ config TILE
def_bool y def_bool y
select HAVE_KVM if !TILEGX select HAVE_KVM if !TILEGX
select GENERIC_FIND_FIRST_BIT select GENERIC_FIND_FIRST_BIT
select GENERIC_FIND_NEXT_BIT
select USE_GENERIC_SMP_HELPERS select USE_GENERIC_SMP_HELPERS
select CC_OPTIMIZE_FOR_SIZE select CC_OPTIMIZE_FOR_SIZE
select HAVE_GENERIC_HARDIRQS select HAVE_GENERIC_HARDIRQS
......
...@@ -15,7 +15,6 @@ endmenu ...@@ -15,7 +15,6 @@ endmenu
config UML_X86 config UML_X86
def_bool y def_bool y
select GENERIC_FIND_FIRST_BIT select GENERIC_FIND_FIRST_BIT
select GENERIC_FIND_NEXT_BIT
config 64BIT config 64BIT
bool bool
......
...@@ -64,7 +64,6 @@ config X86 ...@@ -64,7 +64,6 @@ config X86
select HAVE_GENERIC_HARDIRQS select HAVE_GENERIC_HARDIRQS
select HAVE_SPARSE_IRQ select HAVE_SPARSE_IRQ
select GENERIC_FIND_FIRST_BIT select GENERIC_FIND_FIRST_BIT
select GENERIC_FIND_NEXT_BIT
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
select GENERIC_PENDING_IRQ if SMP select GENERIC_PENDING_IRQ if SMP
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
......
...@@ -20,12 +20,6 @@ config XTENSA ...@@ -20,12 +20,6 @@ config XTENSA
config RWSEM_XCHGADD_ALGORITHM config RWSEM_XCHGADD_ALGORITHM
def_bool y def_bool y
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_FIND_BIT_LE
def_bool y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
def_bool y def_bool y
......
...@@ -148,7 +148,6 @@ static inline unsigned long __ffs64(u64 word) ...@@ -148,7 +148,6 @@ static inline unsigned long __ffs64(u64 word)
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_GENERIC_FIND_LAST_BIT
#ifndef find_last_bit #ifndef find_last_bit
/** /**
* find_last_bit - find the last set bit in a memory region * find_last_bit - find the last set bit in a memory region
...@@ -160,7 +159,6 @@ static inline unsigned long __ffs64(u64 word) ...@@ -160,7 +159,6 @@ static inline unsigned long __ffs64(u64 word)
extern unsigned long find_last_bit(const unsigned long *addr, extern unsigned long find_last_bit(const unsigned long *addr,
unsigned long size); unsigned long size);
#endif #endif
#endif /* CONFIG_GENERIC_FIND_LAST_BIT */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif #endif
...@@ -19,16 +19,6 @@ config RATIONAL ...@@ -19,16 +19,6 @@ config RATIONAL
config GENERIC_FIND_FIRST_BIT config GENERIC_FIND_FIRST_BIT
bool bool
config GENERIC_FIND_NEXT_BIT
bool
config GENERIC_FIND_BIT_LE
bool
config GENERIC_FIND_LAST_BIT
bool
default y
config CRC_CCITT config CRC_CCITT
tristate "CRC-CCITT functions" tristate "CRC-CCITT functions"
help help
......
...@@ -12,7 +12,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ ...@@ -12,7 +12,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
idr.o int_sqrt.o extable.o prio_tree.o \ idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.o \ sha1.o irq_regs.o reciprocal_div.o argv_split.o \
proportions.o prio_heap.o ratelimit.o show_mem.o \ proportions.o prio_heap.o ratelimit.o show_mem.o \
is_single_threaded.o plist.o decompress.o is_single_threaded.o plist.o decompress.o find_next_bit.o
lib-$(CONFIG_MMU) += ioremap.o lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o lib-$(CONFIG_SMP) += cpumask.o
...@@ -22,7 +22,7 @@ lib-y += kobject.o kref.o klist.o ...@@ -22,7 +22,7 @@ lib-y += kobject.o kref.o klist.o
obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \ obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \ bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \
string_helpers.o gcd.o lcm.o list_sort.o uuid.o flex_array.o \ string_helpers.o gcd.o lcm.o list_sort.o uuid.o flex_array.o \
bsearch.o bsearch.o find_last_bit.o
obj-y += kstrtox.o obj-y += kstrtox.o
obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
...@@ -39,10 +39,6 @@ obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o ...@@ -39,10 +39,6 @@ obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
lib-$(CONFIG_GENERIC_FIND_FIRST_BIT) += find_next_bit.o
lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o
lib-$(CONFIG_GENERIC_FIND_BIT_LE) += find_next_bit.o
obj-$(CONFIG_GENERIC_FIND_LAST_BIT) += find_last_bit.o
CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) CFLAGS_hweight.o = $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG) #define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
#ifdef CONFIG_GENERIC_FIND_NEXT_BIT
#ifndef find_next_bit #ifndef find_next_bit
/* /*
* Find the next set bit in a memory region. * Find the next set bit in a memory region.
...@@ -107,9 +106,7 @@ unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size, ...@@ -107,9 +106,7 @@ unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,
} }
EXPORT_SYMBOL(find_next_zero_bit); EXPORT_SYMBOL(find_next_zero_bit);
#endif #endif
#endif /* CONFIG_GENERIC_FIND_NEXT_BIT */
#ifdef CONFIG_GENERIC_FIND_FIRST_BIT
#ifndef find_first_bit #ifndef find_first_bit
/* /*
* Find the first set bit in a memory region. * Find the first set bit in a memory region.
...@@ -165,10 +162,8 @@ unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size) ...@@ -165,10 +162,8 @@ unsigned long find_first_zero_bit(const unsigned long *addr, unsigned long size)
} }
EXPORT_SYMBOL(find_first_zero_bit); EXPORT_SYMBOL(find_first_zero_bit);
#endif #endif
#endif /* CONFIG_GENERIC_FIND_FIRST_BIT */
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
#ifdef CONFIG_GENERIC_FIND_BIT_LE
/* include/linux/byteorder does not support "unsigned long" type */ /* include/linux/byteorder does not support "unsigned long" type */
static inline unsigned long ext2_swabp(const unsigned long * x) static inline unsigned long ext2_swabp(const unsigned long * x)
...@@ -287,5 +282,4 @@ unsigned long find_next_bit_le(const void *addr, unsigned ...@@ -287,5 +282,4 @@ unsigned long find_next_bit_le(const void *addr, unsigned
EXPORT_SYMBOL(find_next_bit_le); EXPORT_SYMBOL(find_next_bit_le);
#endif #endif
#endif /* CONFIG_GENERIC_FIND_BIT_LE */
#endif /* __BIG_ENDIAN */ #endif /* __BIG_ENDIAN */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment