Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...

[linux-2.6-block.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index e0ae0d51f985599b18b1fb7797e8630415868a31..68f7c2b16ff71f7bb5cacff692111e04c2cb9581 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -1,7 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-config ARCH_HAS_MEM_ENCRYPT
-        def_bool y
-
 config MMU
        def_bool y
 
@@ -68,6 +65,7 @@ config S390
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_HAS_GIGANTIC_PAGE
        select ARCH_HAS_KCOV
+       select ARCH_HAS_MEM_ENCRYPT
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_SET_MEMORY
        select ARCH_HAS_STRICT_KERNEL_RWX
@@ -105,6 +103,7 @@ config S390
        select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
        select ARCH_KEEP_MEMBLOCK
        select ARCH_SAVE_PAGE_KEYS if HIBERNATION
+       select ARCH_STACKWALK
        select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_SUPPORTS_NUMA_BALANCING
        select ARCH_USE_BUILTIN_BSWAP
@@ -131,6 +130,7 @@ config S390
        select HAVE_ARCH_TRACEHOOK
        select HAVE_ARCH_TRANSPARENT_HUGEPAGE
        select HAVE_ARCH_VMAP_STACK
+       select HAVE_ASM_MODVERSIONS
        select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES
        select HAVE_CMPXCHG_DOUBLE
        select HAVE_CMPXCHG_LOCAL
@@ -236,6 +236,10 @@ config HAVE_MARCH_Z14_FEATURES
        def_bool n
        select HAVE_MARCH_Z13_FEATURES
 
+config HAVE_MARCH_Z15_FEATURES
+       def_bool n
+       select HAVE_MARCH_Z14_FEATURES
+
 choice
        prompt "Processor type"
        default MARCH_Z196
@@ -307,6 +311,14 @@ config MARCH_Z14
          and 3906 series). The kernel will be slightly faster but will not
          work on older machines.
 
+config MARCH_Z15
+       bool "IBM z15"
+       select HAVE_MARCH_Z15_FEATURES
+       help
+         Select this to enable optimizations for IBM z15 (8562
+         and 8561 series). The kernel will be slightly faster but will not
+         work on older machines.
+
 endchoice
 
 config MARCH_Z900_TUNE
@@ -333,6 +345,9 @@ config MARCH_Z13_TUNE
 config MARCH_Z14_TUNE
        def_bool TUNE_Z14 || MARCH_Z14 && TUNE_DEFAULT
 
+config MARCH_Z15_TUNE
+       def_bool TUNE_Z15 || MARCH_Z15 && TUNE_DEFAULT
+
 choice
        prompt "Tune code generation"
        default TUNE_DEFAULT
@@ -377,6 +392,9 @@ config TUNE_Z13
 config TUNE_Z14
        bool "IBM z14"
 
+config TUNE_Z15
+       bool "IBM z15"
+
 endchoice
 
 config 64BIT