Commit bd823821 authored Aug 30, 2011 by Geert Uytterhoeven Committed by Linus Torvalds Aug 30, 2011

bitops: Move find_next_bit.o from lib-y to obj-y



If there are no builtin users of find_next_bit_le() and
find_next_zero_bit_le(), these functions are not present in the kernel
image, causing m68k allmodconfig to fail with:

  ERROR: "find_next_zero_bit_le" [fs/ufs/ufs.ko] undefined!
  ERROR: "find_next_bit_le" [fs/udf/udf.ko] undefined!
  ...

This started to happen after commit 171d809d ("m68k: merge mmu and
non-mmu bitops.h"), as m68k had its own inline versions before.

commit 63e424c8 ("arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,
BIT_LE, LAST_BIT}") added find_last_bit.o to obj-y (so it's always
included), but find_next_bit.o to lib-y (so it gets removed by the
linker if there are no builtin users).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 90e93648

lib/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 md5.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 find_next_bit.o
		is_single_threaded.o plist.o decompress.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 find_last_bit.o
		bsearch.o find_last_bit.o find_next_bit.o
		obj-y += kstrtox.o
		obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o

Admin message