Merge tag 'percpu-for-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis...

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

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 18bf754..ae29e43 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -127,7 +127,8 @@ config S390
        select ARCH_WANTS_NO_INSTR
        select ARCH_WANT_DEFAULT_BPF_JIT
        select ARCH_WANT_IPC_PARSE_VERSION
-       select ARCH_WANT_OPTIMIZE_VMEMMAP
+       select ARCH_WANT_KERNEL_PMD_MKWRITE
+       select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
        select BUILDTIME_TABLE_SORT
        select CLONE_BACKWARDS2
        select DMA_OPS if PCI
@@ -143,6 +144,7 @@ config S390
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
        select GENERIC_VDSO_TIME_NS
+       select GENERIC_IOREMAP if PCI
        select HAVE_ALIGNED_STRUCT_PAGE if SLUB
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_JUMP_LABEL
@@ -214,6 +216,7 @@ config S390
        select HAVE_VIRT_CPU_ACCOUNTING_IDLE
        select IOMMU_HELPER             if PCI
        select IOMMU_SUPPORT            if PCI
+       select KEXEC
        select MMU_GATHER_MERGE_VMAS
        select MMU_GATHER_NO_GATHER
        select MMU_GATHER_RCU_TABLE_FREE
@@ -245,6 +248,25 @@ config PGTABLE_LEVELS
 
 source "kernel/livepatch/Kconfig"
 
+config ARCH_SUPPORTS_KEXEC
+       def_bool y
+
+config ARCH_SUPPORTS_KEXEC_FILE
+       def_bool CRYPTO && CRYPTO_SHA256 && CRYPTO_SHA256_S390
+
+config ARCH_SUPPORTS_KEXEC_SIG
+       def_bool MODULE_SIG_FORMAT
+
+config ARCH_SUPPORTS_KEXEC_PURGATORY
+       def_bool KEXEC_FILE
+
+config ARCH_SUPPORTS_CRASH_DUMP
+       def_bool y
+       help
+         Refer to <file:Documentation/arch/s390/zfcpdump.rst> for more details on this.
+         This option also enables s390 zfcpdump.
+         See also <file:Documentation/arch/s390/zfcpdump.rst>
+
 menu "Processor type and features"
 
 config HAVE_MARCH_Z10_FEATURES
@@ -483,36 +505,6 @@ config SCHED_TOPOLOGY
 
 source "kernel/Kconfig.hz"
 
-config KEXEC
-       def_bool y
-       select KEXEC_CORE
-
-config KEXEC_FILE
-       bool "kexec file based system call"
-       select KEXEC_CORE
-       depends on CRYPTO
-       depends on CRYPTO_SHA256
-       depends on CRYPTO_SHA256_S390
-       help
-         Enable the kexec file based system call. In contrast to the normal
-         kexec system call this system call takes file descriptors for the
-         kernel and initramfs as arguments.
-
-config ARCH_HAS_KEXEC_PURGATORY
-       def_bool y
-       depends on KEXEC_FILE
-
-config KEXEC_SIG
-       bool "Verify kernel signature during kexec_file_load() syscall"
-       depends on KEXEC_FILE && MODULE_SIG_FORMAT
-       help
-         This option makes kernel signature verification mandatory for
-         the kexec_file_load() syscall.
-
-         In addition to that option, you need to enable signature
-         verification for the corresponding kernel image type being
-         loaded in order for this to work.
-
 config CERT_STORE
        bool "Get user certificates via DIAG320"
        depends on KEYS
@@ -745,22 +737,6 @@ config VFIO_AP
 
 endmenu
 
-menu "Dump support"
-
-config CRASH_DUMP
-       bool "kernel crash dumps"
-       select KEXEC
-       help
-         Generate crash dump after being started by kexec.
-         Crash dump kernels are loaded in the main kernel with kexec-tools
-         into a specially reserved region and then later executed after
-         a crash by kdump/kexec.
-         Refer to <file:Documentation/arch/s390/zfcpdump.rst> for more details on this.
-         This option also enables s390 zfcpdump.
-         See also <file:Documentation/arch/s390/zfcpdump.rst>
-
-endmenu
-
 config CCW
        def_bool y