Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6

[firefly-linux-kernel-4.4.55.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 42d2c35a5bbdd61b594ee5e2b9431532ad02a59f..46c3bff3ced20e31c379bdde1c9a50c95206ff8e 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -109,6 +109,9 @@ config X86
        select HAVE_RCU_USER_QS if X86_64
        select HAVE_IRQ_TIME_ACCOUNTING
        select GENERIC_KERNEL_THREAD
+       select GENERIC_KERNEL_EXECVE
+       select MODULES_USE_ELF_REL if X86_32
+       select MODULES_USE_ELF_RELA if X86_64
 
 config INSTRUCTION_DECODER
        def_bool y