openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Greg 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Akinobu Mita 2011-05-26 16:26:10 -07:00 committed by Linus Torvalds
parent 19de85ef57
commit 63e424c844
24 changed files with 2 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/alpha/Kconfig
View File

@ -41,10 +41,6 @@ config ARCH_HAS_ILOG2_U64
bool
default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_CALIBRATE_DELAY
bool
default y

3
arch/blackfin/Kconfig
View File

@ -47,9 +47,6 @@ config GENERIC_BUG
config ZONE_DMA
def_bool y
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_GPIO
def_bool y

4
arch/cris/Kconfig
View File

@ -31,10 +31,6 @@ config ARCH_HAS_ILOG2_U64
bool
default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_HWEIGHT
bool
default y

8
arch/frv/Kconfig
View File

@ -19,14 +19,6 @@ config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM
bool
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT
bool
default y

8
arch/h8300/Kconfig
View File

@ -41,14 +41,6 @@ config ARCH_HAS_ILOG2_U64
bool
default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT
bool
default y

4
arch/ia64/Kconfig
View File

@ -78,10 +78,6 @@ config HUGETLB_PAGE_SIZE_VARIABLE
depends on HUGETLB_PAGE
default y
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_CALIBRATE_DELAY
bool
default y

8
arch/m32r/Kconfig
View File

@ -256,14 +256,6 @@ config ARCH_HAS_ILOG2_U64
bool
default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT
bool
default y

4
arch/m68k/Kconfig.nommu
View File

@ -2,10 +2,6 @@ config FPU
bool
default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_GPIO
bool
default n

6
arch/microblaze/Kconfig
View File

@ -33,12 +33,6 @@ config ARCH_HAS_ILOG2_U32
config ARCH_HAS_ILOG2_U64
def_bool n
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_FIND_BIT_LE
def_bool y
config GENERIC_HWEIGHT
def_bool y

8
arch/mips/Kconfig
View File

@ -821,14 +821,6 @@ config ARCH_SUPPORTS_OPROFILE
bool
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
bool
default y

3
arch/mn10300/Kconfig
View File

@ -44,9 +44,6 @@ config GENERIC_CALIBRATE_DELAY
config GENERIC_CMOS_UPDATE
def_bool n
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_HWEIGHT
def_bool y

8
arch/parisc/Kconfig
View File

@ -47,14 +47,6 @@ config ARCH_HAS_ILOG2_U64
bool
default n
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_BUG
bool
default y

8
arch/powerpc/Kconfig
View File

@ -91,14 +91,6 @@ config GENERIC_HWEIGHT
bool
default y
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_GPIO
bool
help

3
arch/score/Kconfig
View File

@ -43,9 +43,6 @@ config NO_DMA
config RWSEM_GENERIC_SPINLOCK
def_bool y
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_HWEIGHT
def_bool y

6
arch/sh/Kconfig
View File

@ -71,12 +71,6 @@ config GENERIC_CSUM
def_bool y
depends on SUPERH64
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_FIND_BIT_LE
def_bool y
config GENERIC_HWEIGHT
def_bool y

8
arch/sparc/Kconfig
View File

@ -190,14 +190,6 @@ config RWSEM_XCHGADD_ALGORITHM
bool
default y if SPARC64
config GENERIC_FIND_NEXT_BIT
bool
default y
config GENERIC_FIND_BIT_LE
bool
default y
config GENERIC_HWEIGHT
bool
default y if !ULTRA_HAS_POPULATION_COUNT

1
arch/tile/Kconfig
View File

@ -5,7 +5,6 @@ config TILE
def_bool y
select HAVE_KVM if !TILEGX
select GENERIC_FIND_FIRST_BIT
select GENERIC_FIND_NEXT_BIT
select USE_GENERIC_SMP_HELPERS
select CC_OPTIMIZE_FOR_SIZE
select HAVE_GENERIC_HARDIRQS

1
arch/um/Kconfig.x86
View File

@ -15,7 +15,6 @@ endmenu
config UML_X86
def_bool y
select GENERIC_FIND_FIRST_BIT
select GENERIC_FIND_NEXT_BIT
config 64BIT
bool

1
arch/x86/Kconfig
View File

@ -64,7 +64,6 @@ config X86
select HAVE_GENERIC_HARDIRQS
select HAVE_SPARSE_IRQ
select GENERIC_FIND_FIRST_BIT
select GENERIC_FIND_NEXT_BIT
select GENERIC_IRQ_PROBE
select GENERIC_PENDING_IRQ if SMP
select GENERIC_IRQ_SHOW

6
arch/xtensa/Kconfig
View File

@ -20,12 +20,6 @@ config XTENSA
config RWSEM_XCHGADD_ALGORITHM
def_bool y
config GENERIC_FIND_NEXT_BIT
def_bool y
config GENERIC_FIND_BIT_LE
def_bool y
config GENERIC_HWEIGHT
def_bool y

2
include/linux/bitops.h
View File

@ -148,7 +148,6 @@ 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
@ -160,7 +159,6 @@ 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__ */
#endif

10
lib/Kconfig
View File

@ -19,16 +19,6 @@ config RATIONAL
config GENERIC_FIND_FIRST_BIT
bool
config GENERIC_FIND_NEXT_BIT
bool
config GENERIC_FIND_BIT_LE
bool
config GENERIC_FIND_LAST_BIT
bool
default y
config CRC_CCITT
tristate "CRC-CCITT functions"
help

8
lib/Makefile
View File

@ -12,7 +12,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.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_SMP) += cpumask.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 \
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 \
bsearch.o
bsearch.o find_last_bit.o
obj-y += kstrtox.o
obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
@ -39,10 +39,6 @@ obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o
obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.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))
obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o

6
lib/find_next_bit.c
View File

@ -16,7 +16,6 @@
#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
#ifdef CONFIG_GENERIC_FIND_NEXT_BIT
#ifndef find_next_bit
/*
* 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,
}
EXPORT_SYMBOL(find_next_zero_bit);
#endif
#endif /* CONFIG_GENERIC_FIND_NEXT_BIT */
#ifdef CONFIG_GENERIC_FIND_FIRST_BIT
#ifndef find_first_bit
/*
* 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)
}
EXPORT_SYMBOL(find_first_zero_bit);
#endif
#endif /* CONFIG_GENERIC_FIND_FIRST_BIT */
#ifdef __BIG_ENDIAN
#ifdef CONFIG_GENERIC_FIND_BIT_LE
/* include/linux/byteorder does not support "unsigned long" type */
static inline unsigned long ext2_swabp(const unsigned long * x)
@ -287,5 +282,4 @@ unsigned long find_next_bit_le(const void *addr, unsigned
EXPORT_SYMBOL(find_next_bit_le);
#endif
#endif /* CONFIG_GENERIC_FIND_BIT_LE */
#endif /* __BIG_ENDIAN */