Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[linux.git] / arch / x86 / um / Kconfig

diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 0fd20f241e40c44053987d6aaa0782f9789ddf6f..53c90fd412d1a4637fcb17aeaf1a5d5978a2160a 100644 (file)
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -13,6 +13,7 @@ endmenu
 config UML_X86
        def_bool y
        select GENERIC_FIND_FIRST_BIT
+       select GENERIC_SIGALTSTACK
 
 config 64BIT
        bool "64-bit kernel" if SUBARCH = "x86"
@@ -30,7 +31,7 @@ config X86_64
        select MODULES_USE_ELF_RELA
 
 config RWSEM_XCHGADD_ALGORITHM
-       def_bool X86_XADD && 64BIT
+       def_bool 64BIT
 
 config RWSEM_GENERIC_SPINLOCK
        def_bool !RWSEM_XCHGADD_ALGORITHM