Commit b8fa0571 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "lib: build list_sort() only if needed" 



This reverts commit a069c266.

It turns ou that not only was it missing a case (XFS) that needed it,
but perhaps more importantly, people sometimes want to enable new
modules that they hadn't had enabled before, and if such a module uses
list_sort(), it can't easily be inserted any more.

So rather than add a "select LIST_SORT" to the XFS case, just leave it
compiled in.  It's not all _that_ big, after all, and the inconvenience
isn't worth it.

Requested-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Don Mullis <don.mullis@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Chinner <david@fromorbit.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4da0b66c

drivers/gpu/drm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ menuconfig DRM 
	depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU

	select I2C

	select I2C_ALGOBIT

	select LIST_SORT

	help

	  Kernel-level support for the Direct Rendering Infrastructure (DRI)

	  introduced in XFree86 4.0. If you say Y here, you need to select

fs/ubifs/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ config UBIFS_FS 
	select CRYPTO if UBIFS_FS_ZLIB

	select CRYPTO_LZO if UBIFS_FS_LZO

	select CRYPTO_DEFLATE if UBIFS_FS_ZLIB

	select LIST_SORT

	depends on MTD_UBI

	help

	  UBIFS is a file system for flash devices which works on top of UBI.

lib/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ config TEXTSEARCH_BM 
config TEXTSEARCH_FSM

	tristate



config LIST_SORT

	boolean



config BTREE

	boolean

lib/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,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

	 string_helpers.o gcd.o list_sort.o



ifeq ($(CONFIG_DEBUG_KOBJECT),y)

CFLAGS_kobject.o += -DDEBUG
@@ -40,7 +40,6 @@ lib-$(CONFIG_GENERIC_FIND_FIRST_BIT) += find_next_bit.o 
lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o

obj-$(CONFIG_GENERIC_FIND_LAST_BIT) += find_last_bit.o

obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o

obj-$(CONFIG_LIST_SORT) += list_sort.o

obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o

obj-$(CONFIG_BTREE) += btree.o

obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE