diff options
| author | Randy Dunlap <rdunlap@infradead.org> | 2013-06-18 12:33:40 -0700 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2013-06-24 09:44:49 +0100 |
| commit | 3f5747e01f0176ff5dd477f8ce641195d4227319 (patch) | |
| tree | d0abf660f89113cbdd539eba6acfe24c01c4219c /arch | |
| parent | cbe60f0f98e8500844de4f8f351a12b11a8cd8e3 (diff) | |
x86: fix build error and kconfig for ia32_emulation and binfmt
commit d1603990ea626668c78527376d9ec084d634202d upstream.
Fix kconfig warning and build errors on x86_64 by selecting BINFMT_ELF
when COMPAT_BINFMT_ELF is being selected.
warning: (IA32_EMULATION) selects COMPAT_BINFMT_ELF which has unmet direct dependencies (COMPAT && BINFMT_ELF)
fs/built-in.o: In function `elf_core_dump':
compat_binfmt_elf.c:(.text+0x3e093): undefined reference to `elf_core_extra_phdrs'
compat_binfmt_elf.c:(.text+0x3ebcd): undefined reference to `elf_core_extra_data_size'
compat_binfmt_elf.c:(.text+0x3eddd): undefined reference to `elf_core_write_extra_phdrs'
compat_binfmt_elf.c:(.text+0x3f004): undefined reference to `elf_core_write_extra_data'
[ hpa: This was sent to me for -next but it is a low risk build fix ]
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Link: http://lkml.kernel.org/r/51C0B614.5000708@infradead.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
[ luis: backported to 3.5: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b2b22a6dc99a..eebd0d984342 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2150,6 +2150,7 @@ source "fs/Kconfig.binfmt" config IA32_EMULATION bool "IA32 Emulation" depends on X86_64 + select BINFMT_ELF select COMPAT_BINFMT_ELF ---help--- Include code to run legacy 32-bit programs under a |