lkml.org 
[lkml]   [2016]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 159/180] um: Fix build error and kconfig for i386
    Date
    3.16.7-ckt24 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= <mic@digikod.net>

    commit 42d91f612c879627c925d3779c36877cd440f9f9 upstream.

    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>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/x86/um/Makefile | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/x86/um/Makefile b/arch/x86/um/Makefile
    index eafa324eb7a5..7a97752c6372 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
    \
     
     \ /
      Last update: 2016-02-04 00:21    [W:4.023 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site