Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[mirror_ubuntu-zesty-kernel.git] / arch / x86 / um / Kconfig

diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 30c4eec033afa7e0a3cab735ac93e9281384af78..07611759ce35b4cdcd298b402c22d39ada73e39a 100644 (file)
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -14,6 +14,7 @@ config UML_X86
        def_bool y
        select GENERIC_FIND_FIRST_BIT
        select GENERIC_KERNEL_THREAD
+       select GENERIC_KERNEL_EXECVE
 
 config 64BIT
        bool "64-bit kernel" if SUBARCH = "x86"
@@ -23,9 +24,11 @@ config X86_32
        def_bool !64BIT
        select HAVE_AOUT
        select ARCH_WANT_IPC_PARSE_VERSION
+       select MODULES_USE_ELF_REL
 
 config X86_64
        def_bool 64BIT
+       select MODULES_USE_ELF_RELA
 
 config RWSEM_XCHGADD_ALGORITHM
        def_bool X86_XADD && 64BIT