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

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

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index f6cc1528df89b8ffd35591ba166d37f9e0fdff4d..2c9789da0e249ffae45e5714ea505d13822efd2f 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -91,6 +91,7 @@ config S390
        select ARCH_INLINE_WRITE_UNLOCK_BH
        select ARCH_INLINE_WRITE_UNLOCK_IRQ
        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
+       select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
        select ARCH_SAVE_PAGE_KEYS if HIBERNATION
        select ARCH_WANT_IPC_PARSE_VERSION
        select BUILDTIME_EXTABLE_SORT
@@ -133,7 +134,7 @@ config S390
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_UID16 if 32BIT
        select HAVE_VIRT_CPU_ACCOUNTING
-       select HAVE_VIRT_TO_BUS
+       select VIRT_TO_BUS
        select INIT_ALL_POSSIBLE
        select KTIME_SCALAR if 32BIT
        select MODULES_USE_ELF_RELA
@@ -374,19 +375,6 @@ config PACK_STACK
 
          Say Y if you are unsure.
 
-config SMALL_STACK
-       def_bool n
-       prompt "Use 8kb for kernel stack instead of 16kb"
-       depends on PACK_STACK && 64BIT && !LOCKDEP
-       help
-         If you say Y here and the compiler supports the -mkernel-backchain
-         option the kernel will use a smaller kernel stack size. The reduced
-         size is 8kb instead of 16kb. This allows to run more threads on a
-         system and reduces the pressure on the memory management for higher
-         order page allocations.
-
-         Say N if you are unsure.
-
 config CHECK_STACK
        def_bool y
        prompt "Detect kernel stack overflow"