summaryrefslogtreecommitdiffstats
path: root/arch/x86/um/Makefile
diff options
context:
space:
mode:
authorMickaël Salaün <mic@digikod.net>2015-12-24 13:12:11 +0100
committerRichard Weinberger <richard@nod.at>2016-01-10 21:49:49 +0100
commit42d91f612c879627c925d3779c36877cd440f9f9 (patch)
treed58a44920a1fd81e966889daf5a2a92a5ae5bd28 /arch/x86/um/Makefile
parentum: Add seccomp support (diff)
downloadlinux-42d91f612c879627c925d3779c36877cd440f9f9.tar.xz
linux-42d91f612c879627c925d3779c36877cd440f9f9.zip
um: Fix build error and kconfig for i386
Fix build error by generating elfcore.o only when ELF_CORE (depending on COREDUMP) is selected: arch/x86/um/built-in.o: In function `elf_core_write_extra_phdrs': (.text+0x3e62): undefined reference to `dump_emit' arch/x86/um/built-in.o: In function `elf_core_write_extra_data': (.text+0x3eef): undefined reference to `dump_emit' Fixes: 5d2acfc7b974 ("kconfig: make allnoconfig disable options behind EMBEDDED and EXPERT") Signed-off-by: Mickaël Salaün <mic@digikod.net> Cc: Jeff Dike <jdike@addtoit.com> Cc: Richard Weinberger <richard@nod.at> Cc: Josh Triplett <josh@joshtriplett.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Michal Marek <mmarek@suse.cz> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Richard Weinberger <richard@nod.at> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'arch/x86/um/Makefile')
-rw-r--r--arch/x86/um/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile
index a8fecc226946..3ee2bb6b440b 100644
--- a/arch/x86/um/Makefile
+++ b/arch/x86/um/Makefile
@@ -17,7 +17,7 @@ obj-y = bug.o bugs_$(BITS).o delay.o fault.o ksyms.o ldt.o \
ifeq ($(CONFIG_X86_32),y)
obj-y += checksum_32.o
-obj-$(CONFIG_BINFMT_ELF) += elfcore.o
+obj-$(CONFIG_ELF_CORE) += elfcore.o
subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
subarch-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += ../lib/rwsem.o