commit 3516bd729358a2a9b090c1905bd2a3fa926e24c6 · tjh.dev/kernel

+17 -14

arch/s390/Kconfig

··· 54 55 config S390 56 def_bool y 57 select ARCH_BINFMT_ELF_STATE 58 select ARCH_HAS_DEBUG_VM_PGTABLE 59 select ARCH_HAS_DEBUG_WX 60 select ARCH_HAS_DEVMEM_IS_ALLOWED 61 select ARCH_HAS_ELF_RANDOMIZE 62 select ARCH_HAS_FORTIFY_SOURCE 63 select ARCH_HAS_GCOV_PROFILE_ALL 64 select ARCH_HAS_GIGANTIC_PAGE 65 select ARCH_HAS_KCOV 66 select ARCH_HAS_MEM_ENCRYPT 67 select ARCH_HAS_PTE_SPECIAL 68 select ARCH_HAS_SET_MEMORY 69 select ARCH_HAS_STRICT_KERNEL_RWX 70 select ARCH_HAS_STRICT_MODULE_RWX ··· 117 select ARCH_WANT_IPC_PARSE_VERSION 118 select BUILDTIME_TABLE_SORT 119 select CLONE_BACKWARDS2 120 select DMA_OPS if PCI 121 select DYNAMIC_FTRACE if FUNCTION_TRACER 122 select GENERIC_CPU_AUTOPROBE 123 select GENERIC_CPU_VULNERABILITIES 124 select GENERIC_FIND_FIRST_BIT ··· 134 select HAVE_ARCH_JUMP_LABEL_RELATIVE 135 select HAVE_ARCH_KASAN 136 select HAVE_ARCH_KASAN_VMALLOC 137 - select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES 138 select HAVE_ARCH_SECCOMP_FILTER 139 select HAVE_ARCH_SOFT_DIRTY 140 select HAVE_ARCH_TRACEHOOK 141 select HAVE_ARCH_TRANSPARENT_HUGEPAGE 142 select HAVE_ARCH_VMAP_STACK 143 select HAVE_ASM_MODVERSIONS 144 - select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES 145 select HAVE_CMPXCHG_DOUBLE 146 select HAVE_CMPXCHG_LOCAL 147 select HAVE_DEBUG_KMEMLEAK 148 select HAVE_DMA_CONTIGUOUS 149 select HAVE_DYNAMIC_FTRACE 150 select HAVE_DYNAMIC_FTRACE_WITH_REGS 151 - select HAVE_FAST_GUP 152 select HAVE_EFFICIENT_UNALIGNED_ACCESS 153 select HAVE_FENTRY 154 select HAVE_FTRACE_MCOUNT_RECORD 155 select HAVE_FUNCTION_ERROR_INJECTION ··· 170 select HAVE_KRETPROBES 171 select HAVE_KVM 172 select HAVE_LIVEPATCH 173 - select HAVE_PERF_REGS 174 - select HAVE_PERF_USER_STACK_DUMP 175 select HAVE_MEMBLOCK_PHYS_MAP 176 - select MMU_GATHER_NO_GATHER 177 select HAVE_MOD_ARCH_SPECIFIC 178 select HAVE_NOP_MCOUNT 179 select HAVE_OPROFILE 180 select HAVE_PCI 181 select HAVE_PERF_EVENTS 182 - select MMU_GATHER_RCU_TABLE_FREE 183 select HAVE_REGS_AND_STACK_ACCESS_API 184 select HAVE_RELIABLE_STACKTRACE 185 select HAVE_RSEQ ··· 187 select HAVE_VIRT_CPU_ACCOUNTING_IDLE 188 select IOMMU_HELPER if PCI 189 select IOMMU_SUPPORT if PCI 190 select MODULES_USE_ELF_RELA 191 select NEED_DMA_MAP_STATE if PCI 192 select NEED_SG_DMA_LENGTH if PCI ··· 198 select PCI_MSI if PCI 199 select PCI_MSI_ARCH_FALLBACKS if PCI_MSI 200 select SPARSE_IRQ 201 select SYSCTL_EXCEPTION_TRACE 202 select THREAD_INFO_IN_TASK 203 select TTY 204 select VIRT_CPU_ACCOUNTING 205 - select ARCH_HAS_SCALED_CPUTIME 206 - select HAVE_NMI 207 - select ARCH_HAS_FORCE_DMA_UNENCRYPTED 208 - select SWIOTLB 209 - select GENERIC_ALLOCATOR 210 - imply IMA_SECURE_AND_OR_TRUSTED_BOOT 211 - 212 213 config SCHED_OMIT_FRAME_POINTER 214 def_bool y

··· 54 55 config S390 56 def_bool y 57 + # 58 + # Note: keep this list sorted alphabetically 59 + # 60 + imply IMA_SECURE_AND_OR_TRUSTED_BOOT 61 select ARCH_BINFMT_ELF_STATE 62 select ARCH_HAS_DEBUG_VM_PGTABLE 63 select ARCH_HAS_DEBUG_WX 64 select ARCH_HAS_DEVMEM_IS_ALLOWED 65 select ARCH_HAS_ELF_RANDOMIZE 66 + select ARCH_HAS_FORCE_DMA_UNENCRYPTED 67 select ARCH_HAS_FORTIFY_SOURCE 68 select ARCH_HAS_GCOV_PROFILE_ALL 69 select ARCH_HAS_GIGANTIC_PAGE 70 select ARCH_HAS_KCOV 71 select ARCH_HAS_MEM_ENCRYPT 72 select ARCH_HAS_PTE_SPECIAL 73 + select ARCH_HAS_SCALED_CPUTIME 74 select ARCH_HAS_SET_MEMORY 75 select ARCH_HAS_STRICT_KERNEL_RWX 76 select ARCH_HAS_STRICT_MODULE_RWX ··· 111 select ARCH_WANT_IPC_PARSE_VERSION 112 select BUILDTIME_TABLE_SORT 113 select CLONE_BACKWARDS2 114 + select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES 115 select DMA_OPS if PCI 116 select DYNAMIC_FTRACE if FUNCTION_TRACER 117 + select GENERIC_ALLOCATOR 118 select GENERIC_CPU_AUTOPROBE 119 select GENERIC_CPU_VULNERABILITIES 120 select GENERIC_FIND_FIRST_BIT ··· 126 select HAVE_ARCH_JUMP_LABEL_RELATIVE 127 select HAVE_ARCH_KASAN 128 select HAVE_ARCH_KASAN_VMALLOC 129 select HAVE_ARCH_SECCOMP_FILTER 130 select HAVE_ARCH_SOFT_DIRTY 131 select HAVE_ARCH_TRACEHOOK 132 select HAVE_ARCH_TRANSPARENT_HUGEPAGE 133 select HAVE_ARCH_VMAP_STACK 134 select HAVE_ASM_MODVERSIONS 135 select HAVE_CMPXCHG_DOUBLE 136 select HAVE_CMPXCHG_LOCAL 137 select HAVE_DEBUG_KMEMLEAK 138 select HAVE_DMA_CONTIGUOUS 139 select HAVE_DYNAMIC_FTRACE 140 select HAVE_DYNAMIC_FTRACE_WITH_REGS 141 + select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES 142 select HAVE_EFFICIENT_UNALIGNED_ACCESS 143 + select HAVE_FAST_GUP 144 select HAVE_FENTRY 145 select HAVE_FTRACE_MCOUNT_RECORD 146 select HAVE_FUNCTION_ERROR_INJECTION ··· 163 select HAVE_KRETPROBES 164 select HAVE_KVM 165 select HAVE_LIVEPATCH 166 select HAVE_MEMBLOCK_PHYS_MAP 167 select HAVE_MOD_ARCH_SPECIFIC 168 + select HAVE_NMI 169 select HAVE_NOP_MCOUNT 170 select HAVE_OPROFILE 171 select HAVE_PCI 172 select HAVE_PERF_EVENTS 173 + select HAVE_PERF_REGS 174 + select HAVE_PERF_USER_STACK_DUMP 175 select HAVE_REGS_AND_STACK_ACCESS_API 176 select HAVE_RELIABLE_STACKTRACE 177 select HAVE_RSEQ ··· 181 select HAVE_VIRT_CPU_ACCOUNTING_IDLE 182 select IOMMU_HELPER if PCI 183 select IOMMU_SUPPORT if PCI 184 + select MMU_GATHER_NO_GATHER 185 + select MMU_GATHER_RCU_TABLE_FREE 186 select MODULES_USE_ELF_RELA 187 select NEED_DMA_MAP_STATE if PCI 188 select NEED_SG_DMA_LENGTH if PCI ··· 190 select PCI_MSI if PCI 191 select PCI_MSI_ARCH_FALLBACKS if PCI_MSI 192 select SPARSE_IRQ 193 + select SWIOTLB 194 select SYSCTL_EXCEPTION_TRACE 195 select THREAD_INFO_IN_TASK 196 select TTY 197 select VIRT_CPU_ACCOUNTING 198 + # Note: keep the above list sorted alphabetically 199 200 config SCHED_OMIT_FRAME_POINTER 201 def_bool y

+9 -3

arch/s390/configs/debug_defconfig

··· 61 CONFIG_KPROBES=y 62 CONFIG_JUMP_LABEL=y 63 CONFIG_STATIC_KEYS_SELFTEST=y 64 CONFIG_LOCK_EVENT_COUNTS=y 65 CONFIG_MODULES=y 66 CONFIG_MODULE_FORCE_LOAD=y 67 CONFIG_MODULE_UNLOAD=y ··· 412 CONFIG_SCSI_CONSTANTS=y 413 CONFIG_SCSI_LOGGING=y 414 CONFIG_SCSI_SPI_ATTRS=m 415 - CONFIG_SCSI_FC_ATTRS=y 416 CONFIG_SCSI_SAS_LIBSAS=m 417 CONFIG_SCSI_SRP_ATTRS=m 418 CONFIG_ISCSI_TCP=m 419 CONFIG_SCSI_DEBUG=m 420 - CONFIG_ZFCP=y 421 CONFIG_SCSI_VIRTIO=m 422 CONFIG_SCSI_DH=y 423 CONFIG_SCSI_DH_RDAC=m ··· 446 CONFIG_DM_MULTIPATH_QL=m 447 CONFIG_DM_MULTIPATH_ST=m 448 CONFIG_DM_MULTIPATH_HST=m 449 CONFIG_DM_DELAY=m 450 CONFIG_DM_UEVENT=y 451 CONFIG_DM_FLAKEY=m ··· 545 # CONFIG_INPUT_MOUSE is not set 546 # CONFIG_SERIO is not set 547 CONFIG_LEGACY_PTY_COUNT=0 548 - CONFIG_NULL_TTY=m 549 CONFIG_VIRTIO_CONSOLE=y 550 CONFIG_HW_RANDOM_VIRTIO=m 551 CONFIG_RAW_DRIVER=m ··· 576 CONFIG_VIRTIO_INPUT=y 577 CONFIG_VHOST_NET=m 578 CONFIG_VHOST_VSOCK=m 579 CONFIG_S390_CCW_IOMMU=y 580 CONFIG_S390_AP_IOMMU=y 581 CONFIG_EXT4_FS=y ··· 658 CONFIG_CIFS_POSIX=y 659 # CONFIG_CIFS_DEBUG is not set 660 CONFIG_CIFS_DFS_UPCALL=y 661 CONFIG_NLS_DEFAULT="utf8" 662 CONFIG_NLS_CODEPAGE_437=m 663 CONFIG_NLS_CODEPAGE_850=m ··· 830 CONFIG_BLK_DEV_IO_TRACE=y 831 CONFIG_BPF_KPROBE_OVERRIDE=y 832 CONFIG_HIST_TRIGGERS=y 833 CONFIG_DEBUG_USER_ASCE=y 834 CONFIG_NOTIFIER_ERROR_INJECTION=m 835 CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m

··· 61 CONFIG_KPROBES=y 62 CONFIG_JUMP_LABEL=y 63 CONFIG_STATIC_KEYS_SELFTEST=y 64 + CONFIG_SECCOMP_CACHE_DEBUG=y 65 CONFIG_LOCK_EVENT_COUNTS=y 66 + # CONFIG_GCC_PLUGINS is not set 67 CONFIG_MODULES=y 68 CONFIG_MODULE_FORCE_LOAD=y 69 CONFIG_MODULE_UNLOAD=y ··· 410 CONFIG_SCSI_CONSTANTS=y 411 CONFIG_SCSI_LOGGING=y 412 CONFIG_SCSI_SPI_ATTRS=m 413 + CONFIG_SCSI_FC_ATTRS=m 414 CONFIG_SCSI_SAS_LIBSAS=m 415 CONFIG_SCSI_SRP_ATTRS=m 416 CONFIG_ISCSI_TCP=m 417 CONFIG_SCSI_DEBUG=m 418 + CONFIG_ZFCP=m 419 CONFIG_SCSI_VIRTIO=m 420 CONFIG_SCSI_DH=y 421 CONFIG_SCSI_DH_RDAC=m ··· 444 CONFIG_DM_MULTIPATH_QL=m 445 CONFIG_DM_MULTIPATH_ST=m 446 CONFIG_DM_MULTIPATH_HST=m 447 + CONFIG_DM_MULTIPATH_IOA=m 448 CONFIG_DM_DELAY=m 449 CONFIG_DM_UEVENT=y 450 CONFIG_DM_FLAKEY=m ··· 542 # CONFIG_INPUT_MOUSE is not set 543 # CONFIG_SERIO is not set 544 CONFIG_LEGACY_PTY_COUNT=0 545 CONFIG_VIRTIO_CONSOLE=y 546 CONFIG_HW_RANDOM_VIRTIO=m 547 CONFIG_RAW_DRIVER=m ··· 574 CONFIG_VIRTIO_INPUT=y 575 CONFIG_VHOST_NET=m 576 CONFIG_VHOST_VSOCK=m 577 + # CONFIG_SURFACE_PLATFORMS is not set 578 CONFIG_S390_CCW_IOMMU=y 579 CONFIG_S390_AP_IOMMU=y 580 CONFIG_EXT4_FS=y ··· 655 CONFIG_CIFS_POSIX=y 656 # CONFIG_CIFS_DEBUG is not set 657 CONFIG_CIFS_DFS_UPCALL=y 658 + CONFIG_CIFS_SWN_UPCALL=y 659 CONFIG_NLS_DEFAULT="utf8" 660 CONFIG_NLS_CODEPAGE_437=m 661 CONFIG_NLS_CODEPAGE_850=m ··· 826 CONFIG_BLK_DEV_IO_TRACE=y 827 CONFIG_BPF_KPROBE_OVERRIDE=y 828 CONFIG_HIST_TRIGGERS=y 829 + CONFIG_FTRACE_STARTUP_TEST=y 830 + # CONFIG_EVENT_TRACE_STARTUP_TEST is not set 831 CONFIG_DEBUG_USER_ASCE=y 832 CONFIG_NOTIFIER_ERROR_INJECTION=m 833 CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m

+7 -4

arch/s390/configs/defconfig

··· 58 CONFIG_OPROFILE=m 59 CONFIG_KPROBES=y 60 CONFIG_JUMP_LABEL=y 61 CONFIG_MODULES=y 62 CONFIG_MODULE_FORCE_LOAD=y 63 CONFIG_MODULE_UNLOAD=y ··· 96 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y 97 CONFIG_IDLE_PAGE_TRACKING=y 98 CONFIG_PERCPU_STATS=y 99 - CONFIG_GUP_TEST=y 100 CONFIG_NET=y 101 CONFIG_PACKET=y 102 CONFIG_PACKET_DIAG=m ··· 403 CONFIG_SCSI_CONSTANTS=y 404 CONFIG_SCSI_LOGGING=y 405 CONFIG_SCSI_SPI_ATTRS=m 406 - CONFIG_SCSI_FC_ATTRS=y 407 CONFIG_SCSI_SAS_LIBSAS=m 408 CONFIG_SCSI_SRP_ATTRS=m 409 CONFIG_ISCSI_TCP=m 410 CONFIG_SCSI_DEBUG=m 411 - CONFIG_ZFCP=y 412 CONFIG_SCSI_VIRTIO=m 413 CONFIG_SCSI_DH=y 414 CONFIG_SCSI_DH_RDAC=m ··· 437 CONFIG_DM_MULTIPATH_QL=m 438 CONFIG_DM_MULTIPATH_ST=m 439 CONFIG_DM_MULTIPATH_HST=m 440 CONFIG_DM_DELAY=m 441 CONFIG_DM_UEVENT=y 442 CONFIG_DM_FLAKEY=m ··· 537 # CONFIG_INPUT_MOUSE is not set 538 # CONFIG_SERIO is not set 539 CONFIG_LEGACY_PTY_COUNT=0 540 - CONFIG_NULL_TTY=m 541 CONFIG_VIRTIO_CONSOLE=y 542 CONFIG_HW_RANDOM_VIRTIO=m 543 CONFIG_RAW_DRIVER=m ··· 568 CONFIG_VIRTIO_INPUT=y 569 CONFIG_VHOST_NET=m 570 CONFIG_VHOST_VSOCK=m 571 CONFIG_S390_CCW_IOMMU=y 572 CONFIG_S390_AP_IOMMU=y 573 CONFIG_EXT4_FS=y ··· 646 CONFIG_CIFS_POSIX=y 647 # CONFIG_CIFS_DEBUG is not set 648 CONFIG_CIFS_DFS_UPCALL=y 649 CONFIG_NLS_DEFAULT="utf8" 650 CONFIG_NLS_CODEPAGE_437=m 651 CONFIG_NLS_CODEPAGE_850=m ··· 780 CONFIG_BLK_DEV_IO_TRACE=y 781 CONFIG_BPF_KPROBE_OVERRIDE=y 782 CONFIG_HIST_TRIGGERS=y 783 CONFIG_LKDTM=m 784 CONFIG_PERCPU_TEST=m 785 CONFIG_ATOMIC64_SELFTEST=y

··· 58 CONFIG_OPROFILE=m 59 CONFIG_KPROBES=y 60 CONFIG_JUMP_LABEL=y 61 + # CONFIG_GCC_PLUGINS is not set 62 CONFIG_MODULES=y 63 CONFIG_MODULE_FORCE_LOAD=y 64 CONFIG_MODULE_UNLOAD=y ··· 95 CONFIG_DEFERRED_STRUCT_PAGE_INIT=y 96 CONFIG_IDLE_PAGE_TRACKING=y 97 CONFIG_PERCPU_STATS=y 98 CONFIG_NET=y 99 CONFIG_PACKET=y 100 CONFIG_PACKET_DIAG=m ··· 403 CONFIG_SCSI_CONSTANTS=y 404 CONFIG_SCSI_LOGGING=y 405 CONFIG_SCSI_SPI_ATTRS=m 406 + CONFIG_SCSI_FC_ATTRS=m 407 CONFIG_SCSI_SAS_LIBSAS=m 408 CONFIG_SCSI_SRP_ATTRS=m 409 CONFIG_ISCSI_TCP=m 410 CONFIG_SCSI_DEBUG=m 411 + CONFIG_ZFCP=m 412 CONFIG_SCSI_VIRTIO=m 413 CONFIG_SCSI_DH=y 414 CONFIG_SCSI_DH_RDAC=m ··· 437 CONFIG_DM_MULTIPATH_QL=m 438 CONFIG_DM_MULTIPATH_ST=m 439 CONFIG_DM_MULTIPATH_HST=m 440 + CONFIG_DM_MULTIPATH_IOA=m 441 CONFIG_DM_DELAY=m 442 CONFIG_DM_UEVENT=y 443 CONFIG_DM_FLAKEY=m ··· 536 # CONFIG_INPUT_MOUSE is not set 537 # CONFIG_SERIO is not set 538 CONFIG_LEGACY_PTY_COUNT=0 539 CONFIG_VIRTIO_CONSOLE=y 540 CONFIG_HW_RANDOM_VIRTIO=m 541 CONFIG_RAW_DRIVER=m ··· 568 CONFIG_VIRTIO_INPUT=y 569 CONFIG_VHOST_NET=m 570 CONFIG_VHOST_VSOCK=m 571 + # CONFIG_SURFACE_PLATFORMS is not set 572 CONFIG_S390_CCW_IOMMU=y 573 CONFIG_S390_AP_IOMMU=y 574 CONFIG_EXT4_FS=y ··· 645 CONFIG_CIFS_POSIX=y 646 # CONFIG_CIFS_DEBUG is not set 647 CONFIG_CIFS_DFS_UPCALL=y 648 + CONFIG_CIFS_SWN_UPCALL=y 649 CONFIG_NLS_DEFAULT="utf8" 650 CONFIG_NLS_CODEPAGE_437=m 651 CONFIG_NLS_CODEPAGE_850=m ··· 778 CONFIG_BLK_DEV_IO_TRACE=y 779 CONFIG_BPF_KPROBE_OVERRIDE=y 780 CONFIG_HIST_TRIGGERS=y 781 + CONFIG_DEBUG_USER_ASCE=y 782 CONFIG_LKDTM=m 783 CONFIG_PERCPU_TEST=m 784 CONFIG_ATOMIC64_SELFTEST=y

+2

arch/s390/configs/zfcpdump_defconfig

··· 22 # CONFIG_VIRTUALIZATION is not set 23 # CONFIG_S390_GUEST is not set 24 # CONFIG_SECCOMP is not set 25 CONFIG_PARTITION_ADVANCED=y 26 CONFIG_IBM_PARTITION=y 27 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set ··· 59 # CONFIG_HID is not set 60 # CONFIG_VIRTIO_MENU is not set 61 # CONFIG_VHOST_MENU is not set 62 # CONFIG_IOMMU_SUPPORT is not set 63 # CONFIG_DNOTIFY is not set 64 # CONFIG_INOTIFY_USER is not set

··· 22 # CONFIG_VIRTUALIZATION is not set 23 # CONFIG_S390_GUEST is not set 24 # CONFIG_SECCOMP is not set 25 + # CONFIG_GCC_PLUGINS is not set 26 CONFIG_PARTITION_ADVANCED=y 27 CONFIG_IBM_PARTITION=y 28 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set ··· 58 # CONFIG_HID is not set 59 # CONFIG_VIRTIO_MENU is not set 60 # CONFIG_VHOST_MENU is not set 61 + # CONFIG_SURFACE_PLATFORMS is not set 62 # CONFIG_IOMMU_SUPPORT is not set 63 # CONFIG_DNOTIFY is not set 64 # CONFIG_INOTIFY_USER is not set