tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

s390: update defconfigs

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Heiko Carstens and committed by
Martin Schwidefsky 02522ad7 a541f0eb

+63 -43
+11 -3
arch/s390/configs/debug_defconfig
··· 64 64 CONFIG_PREEMPT=y 65 65 CONFIG_HZ_100=y 66 66 CONFIG_KEXEC_FILE=y 67 + CONFIG_EXPOLINE=y 68 + CONFIG_EXPOLINE_AUTO=y 67 69 CONFIG_MEMORY_HOTPLUG=y 68 70 CONFIG_MEMORY_HOTREMOVE=y 69 71 CONFIG_KSM=y ··· 86 84 CONFIG_HOTPLUG_PCI=y 87 85 CONFIG_HOTPLUG_PCI_S390=y 88 86 CONFIG_CHSC_SCH=y 87 + CONFIG_VFIO_AP=m 89 88 CONFIG_CRASH_DUMP=y 90 89 CONFIG_BINFMT_MISC=m 91 90 CONFIG_HIBERNATION=y 91 + CONFIG_PM_DEBUG=y 92 92 CONFIG_NET=y 93 93 CONFIG_PACKET=y 94 94 CONFIG_PACKET_DIAG=m ··· 165 161 CONFIG_NF_CT_NETLINK=m 166 162 CONFIG_NF_CT_NETLINK_TIMEOUT=m 167 163 CONFIG_NF_TABLES=m 168 - CONFIG_NFT_EXTHDR=m 169 - CONFIG_NFT_META=m 170 164 CONFIG_NFT_CT=m 171 165 CONFIG_NFT_COUNTER=m 172 166 CONFIG_NFT_LOG=m ··· 367 365 CONFIG_NET_ACT_CSUM=m 368 366 CONFIG_DNS_RESOLVER=y 369 367 CONFIG_OPENVSWITCH=m 368 + CONFIG_VSOCKETS=m 369 + CONFIG_VIRTIO_VSOCKETS=m 370 370 CONFIG_NETLINK_DIAG=m 371 371 CONFIG_CGROUP_NET_PRIO=y 372 372 CONFIG_BPF_JIT=y ··· 465 461 CONFIG_PPPOL2TP=m 466 462 CONFIG_PPP_ASYNC=m 467 463 CONFIG_PPP_SYNC_TTY=m 464 + CONFIG_ISM=m 468 465 CONFIG_INPUT_EVDEV=y 469 466 # CONFIG_INPUT_KEYBOARD is not set 470 467 # CONFIG_INPUT_MOUSE is not set ··· 491 486 CONFIG_MLX5_INFINIBAND=m 492 487 CONFIG_VFIO=m 493 488 CONFIG_VFIO_PCI=m 489 + CONFIG_VFIO_MDEV=m 490 + CONFIG_VFIO_MDEV_DEVICE=m 494 491 CONFIG_VIRTIO_PCI=m 495 492 CONFIG_VIRTIO_BALLOON=m 496 493 CONFIG_VIRTIO_INPUT=y 494 + CONFIG_S390_AP_IOMMU=y 497 495 CONFIG_EXT4_FS=y 498 496 CONFIG_EXT4_FS_POSIX_ACL=y 499 497 CONFIG_EXT4_FS_SECURITY=y ··· 623 615 CONFIG_RCU_TORTURE_TEST=m 624 616 CONFIG_RCU_CPU_STALL_TIMEOUT=300 625 617 CONFIG_NOTIFIER_ERROR_INJECTION=m 626 - CONFIG_PM_NOTIFIER_ERROR_INJECT=m 627 618 CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m 628 619 CONFIG_FAULT_INJECTION=y 629 620 CONFIG_FAILSLAB=y ··· 734 727 CONFIG_KVM=m 735 728 CONFIG_KVM_S390_UCONTROL=y 736 729 CONFIG_VHOST_NET=m 730 + CONFIG_VHOST_VSOCK=m
+11 -2
arch/s390/configs/performance_defconfig
··· 65 65 CONFIG_NUMA=y 66 66 CONFIG_HZ_100=y 67 67 CONFIG_KEXEC_FILE=y 68 + CONFIG_EXPOLINE=y 69 + CONFIG_EXPOLINE_AUTO=y 68 70 CONFIG_MEMORY_HOTPLUG=y 69 71 CONFIG_MEMORY_HOTREMOVE=y 70 72 CONFIG_KSM=y ··· 84 82 CONFIG_HOTPLUG_PCI=y 85 83 CONFIG_HOTPLUG_PCI_S390=y 86 84 CONFIG_CHSC_SCH=y 85 + CONFIG_VFIO_AP=m 87 86 CONFIG_CRASH_DUMP=y 88 87 CONFIG_BINFMT_MISC=m 89 88 CONFIG_HIBERNATION=y 89 + CONFIG_PM_DEBUG=y 90 90 CONFIG_NET=y 91 91 CONFIG_PACKET=y 92 92 CONFIG_PACKET_DIAG=m ··· 163 159 CONFIG_NF_CT_NETLINK=m 164 160 CONFIG_NF_CT_NETLINK_TIMEOUT=m 165 161 CONFIG_NF_TABLES=m 166 - CONFIG_NFT_EXTHDR=m 167 - CONFIG_NFT_META=m 168 162 CONFIG_NFT_CT=m 169 163 CONFIG_NFT_COUNTER=m 170 164 CONFIG_NFT_LOG=m ··· 364 362 CONFIG_NET_ACT_CSUM=m 365 363 CONFIG_DNS_RESOLVER=y 366 364 CONFIG_OPENVSWITCH=m 365 + CONFIG_VSOCKETS=m 366 + CONFIG_VIRTIO_VSOCKETS=m 367 367 CONFIG_NETLINK_DIAG=m 368 368 CONFIG_CGROUP_NET_PRIO=y 369 369 CONFIG_BPF_JIT=y ··· 462 458 CONFIG_PPPOL2TP=m 463 459 CONFIG_PPP_ASYNC=m 464 460 CONFIG_PPP_SYNC_TTY=m 461 + CONFIG_ISM=m 465 462 CONFIG_INPUT_EVDEV=y 466 463 # CONFIG_INPUT_KEYBOARD is not set 467 464 # CONFIG_INPUT_MOUSE is not set ··· 488 483 CONFIG_MLX5_INFINIBAND=m 489 484 CONFIG_VFIO=m 490 485 CONFIG_VFIO_PCI=m 486 + CONFIG_VFIO_MDEV=m 487 + CONFIG_VFIO_MDEV_DEVICE=m 491 488 CONFIG_VIRTIO_PCI=m 492 489 CONFIG_VIRTIO_BALLOON=m 493 490 CONFIG_VIRTIO_INPUT=y 491 + CONFIG_S390_AP_IOMMU=y 494 492 CONFIG_EXT4_FS=y 495 493 CONFIG_EXT4_FS_POSIX_ACL=y 496 494 CONFIG_EXT4_FS_SECURITY=y ··· 674 666 CONFIG_KVM=m 675 667 CONFIG_KVM_S390_UCONTROL=y 676 668 CONFIG_VHOST_NET=m 669 + CONFIG_VHOST_VSOCK=m
+41 -38
arch/s390/defconfig
··· 26 26 CONFIG_CGROUP_PERF=y 27 27 CONFIG_NAMESPACES=y 28 28 CONFIG_USER_NS=y 29 + CONFIG_CHECKPOINT_RESTORE=y 29 30 CONFIG_BLK_DEV_INITRD=y 30 31 CONFIG_EXPERT=y 31 32 # CONFIG_SYSFS_SYSCALL is not set 32 - CONFIG_CHECKPOINT_RESTORE=y 33 33 CONFIG_BPF_SYSCALL=y 34 34 CONFIG_USERFAULTFD=y 35 35 # CONFIG_COMPAT_BRK is not set 36 36 CONFIG_PROFILING=y 37 + CONFIG_LIVEPATCH=y 38 + CONFIG_NR_CPUS=256 39 + CONFIG_NUMA=y 40 + CONFIG_HZ_100=y 41 + CONFIG_KEXEC_FILE=y 42 + CONFIG_CRASH_DUMP=y 43 + CONFIG_HIBERNATION=y 44 + CONFIG_PM_DEBUG=y 45 + CONFIG_CMM=m 37 46 CONFIG_OPROFILE=y 38 47 CONFIG_KPROBES=y 39 48 CONFIG_JUMP_LABEL=y ··· 53 44 CONFIG_PARTITION_ADVANCED=y 54 45 CONFIG_IBM_PARTITION=y 55 46 CONFIG_DEFAULT_DEADLINE=y 56 - CONFIG_LIVEPATCH=y 57 - CONFIG_NR_CPUS=256 58 - CONFIG_NUMA=y 59 - CONFIG_HZ_100=y 60 - CONFIG_KEXEC_FILE=y 47 + CONFIG_BINFMT_MISC=m 61 48 CONFIG_MEMORY_HOTPLUG=y 62 49 CONFIG_MEMORY_HOTREMOVE=y 63 50 CONFIG_KSM=y ··· 65 60 CONFIG_ZSMALLOC=m 66 61 CONFIG_ZSMALLOC_STAT=y 67 62 CONFIG_IDLE_PAGE_TRACKING=y 68 - CONFIG_CRASH_DUMP=y 69 - CONFIG_BINFMT_MISC=m 70 - CONFIG_HIBERNATION=y 71 63 CONFIG_NET=y 72 64 CONFIG_PACKET=y 73 65 CONFIG_UNIX=y ··· 100 98 CONFIG_BLK_DEV_RAM=y 101 99 CONFIG_VIRTIO_BLK=y 102 100 CONFIG_SCSI=y 101 + # CONFIG_SCSI_MQ_DEFAULT is not set 103 102 CONFIG_BLK_DEV_SD=y 104 103 CONFIG_CHR_DEV_ST=y 105 104 CONFIG_BLK_DEV_SR=y ··· 134 131 CONFIG_TUN=m 135 132 CONFIG_VIRTIO_NET=y 136 133 # CONFIG_NET_VENDOR_ALACRITECH is not set 134 + # CONFIG_NET_VENDOR_AURORA is not set 137 135 # CONFIG_NET_VENDOR_CORTINA is not set 138 136 # CONFIG_NET_VENDOR_SOLARFLARE is not set 139 137 # CONFIG_NET_VENDOR_SOCIONEXT is not set ··· 161 157 CONFIG_TMPFS_POSIX_ACL=y 162 158 CONFIG_HUGETLBFS=y 163 159 # CONFIG_NETWORK_FILESYSTEMS is not set 164 - CONFIG_DEBUG_INFO=y 165 - CONFIG_DEBUG_INFO_DWARF4=y 166 - CONFIG_GDB_SCRIPTS=y 167 - CONFIG_UNUSED_SYMBOLS=y 168 - CONFIG_DEBUG_SECTION_MISMATCH=y 169 - CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y 170 - CONFIG_MAGIC_SYSRQ=y 171 - CONFIG_DEBUG_PAGEALLOC=y 172 - CONFIG_DETECT_HUNG_TASK=y 173 - CONFIG_PANIC_ON_OOPS=y 174 - CONFIG_PROVE_LOCKING=y 175 - CONFIG_LOCK_STAT=y 176 - CONFIG_DEBUG_LOCKDEP=y 177 - CONFIG_DEBUG_ATOMIC_SLEEP=y 178 - CONFIG_DEBUG_LIST=y 179 - CONFIG_DEBUG_SG=y 180 - CONFIG_DEBUG_NOTIFIERS=y 181 - CONFIG_RCU_CPU_STALL_TIMEOUT=60 182 - CONFIG_LATENCYTOP=y 183 - CONFIG_SCHED_TRACER=y 184 - CONFIG_FTRACE_SYSCALLS=y 185 - CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y 186 - CONFIG_STACK_TRACER=y 187 - CONFIG_BLK_DEV_IO_TRACE=y 188 - CONFIG_FUNCTION_PROFILER=y 189 - # CONFIG_RUNTIME_TESTING_MENU is not set 190 - CONFIG_S390_PTDUMP=y 191 160 CONFIG_CRYPTO_CRYPTD=m 192 161 CONFIG_CRYPTO_AUTHENC=m 193 162 CONFIG_CRYPTO_TEST=m ··· 170 193 CONFIG_CRYPTO_CFB=m 171 194 CONFIG_CRYPTO_CTS=m 172 195 CONFIG_CRYPTO_LRW=m 196 + CONFIG_CRYPTO_OFB=m 173 197 CONFIG_CRYPTO_PCBC=m 174 198 CONFIG_CRYPTO_XTS=m 175 199 CONFIG_CRYPTO_CMAC=m ··· 209 231 CONFIG_CRYPTO_USER_API_SKCIPHER=m 210 232 CONFIG_CRYPTO_USER_API_RNG=m 211 233 CONFIG_ZCRYPT=m 212 - CONFIG_ZCRYPT_MULTIDEVNODES=y 213 234 CONFIG_PKEY=m 214 235 CONFIG_CRYPTO_PAES_S390=m 215 236 CONFIG_CRYPTO_SHA1_S390=m ··· 224 247 # CONFIG_XZ_DEC_ARM is not set 225 248 # CONFIG_XZ_DEC_ARMTHUMB is not set 226 249 # CONFIG_XZ_DEC_SPARC is not set 227 - CONFIG_CMM=m 250 + CONFIG_DEBUG_INFO=y 251 + CONFIG_DEBUG_INFO_DWARF4=y 252 + CONFIG_GDB_SCRIPTS=y 253 + CONFIG_UNUSED_SYMBOLS=y 254 + CONFIG_DEBUG_SECTION_MISMATCH=y 255 + CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y 256 + CONFIG_MAGIC_SYSRQ=y 257 + CONFIG_DEBUG_PAGEALLOC=y 258 + CONFIG_DETECT_HUNG_TASK=y 259 + CONFIG_PANIC_ON_OOPS=y 260 + CONFIG_PROVE_LOCKING=y 261 + CONFIG_LOCK_STAT=y 262 + CONFIG_DEBUG_LOCKDEP=y 263 + CONFIG_DEBUG_ATOMIC_SLEEP=y 264 + CONFIG_DEBUG_LIST=y 265 + CONFIG_DEBUG_SG=y 266 + CONFIG_DEBUG_NOTIFIERS=y 267 + CONFIG_RCU_CPU_STALL_TIMEOUT=60 268 + CONFIG_LATENCYTOP=y 269 + CONFIG_SCHED_TRACER=y 270 + CONFIG_FTRACE_SYSCALLS=y 271 + CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y 272 + CONFIG_STACK_TRACER=y 273 + CONFIG_BLK_DEV_IO_TRACE=y 274 + CONFIG_FUNCTION_PROFILER=y 275 + # CONFIG_RUNTIME_TESTING_MENU is not set 276 + CONFIG_S390_PTDUMP=y