Skip to content

Commit a25d588

Browse files
committed
s390: update defconfigs
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 711136b commit a25d588

3 files changed

Lines changed: 12 additions & 7 deletions

File tree

arch/s390/configs/debug_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,11 +499,13 @@ CONFIG_NLMON=m
499499
# CONFIG_NET_VENDOR_CHELSIO is not set
500500
# CONFIG_NET_VENDOR_CISCO is not set
501501
# CONFIG_NET_VENDOR_CORTINA is not set
502+
# CONFIG_NET_VENDOR_DAVICOM is not set
502503
# CONFIG_NET_VENDOR_DEC is not set
503504
# CONFIG_NET_VENDOR_DLINK is not set
504505
# CONFIG_NET_VENDOR_EMULEX is not set
505506
# CONFIG_NET_VENDOR_ENGLEDER is not set
506507
# CONFIG_NET_VENDOR_EZCHIP is not set
508+
# CONFIG_NET_VENDOR_FUNGIBLE is not set
507509
# CONFIG_NET_VENDOR_GOOGLE is not set
508510
# CONFIG_NET_VENDOR_HUAWEI is not set
509511
# CONFIG_NET_VENDOR_INTEL is not set
@@ -588,13 +590,13 @@ CONFIG_MLX5_INFINIBAND=m
588590
CONFIG_SYNC_FILE=y
589591
CONFIG_VFIO=m
590592
CONFIG_VFIO_PCI=m
593+
CONFIG_MLX5_VFIO_PCI=m
591594
CONFIG_VFIO_MDEV=m
592595
CONFIG_VIRTIO_PCI=m
593596
CONFIG_VIRTIO_BALLOON=m
594597
CONFIG_VIRTIO_INPUT=y
595598
CONFIG_VHOST_NET=m
596599
CONFIG_VHOST_VSOCK=m
597-
# CONFIG_SURFACE_PLATFORMS is not set
598600
CONFIG_S390_CCW_IOMMU=y
599601
CONFIG_S390_AP_IOMMU=y
600602
CONFIG_EXT4_FS=y
@@ -733,6 +735,7 @@ CONFIG_CRYPTO_MD5=y
733735
CONFIG_CRYPTO_MICHAEL_MIC=m
734736
CONFIG_CRYPTO_RMD160=m
735737
CONFIG_CRYPTO_SHA3=m
738+
CONFIG_CRYPTO_SM3=m
736739
CONFIG_CRYPTO_WP512=m
737740
CONFIG_CRYPTO_AES_TI=m
738741
CONFIG_CRYPTO_ANUBIS=m
@@ -786,7 +789,6 @@ CONFIG_DMA_CMA=y
786789
CONFIG_CMA_SIZE_MBYTES=0
787790
CONFIG_PRINTK_TIME=y
788791
CONFIG_DYNAMIC_DEBUG=y
789-
CONFIG_DEBUG_INFO=y
790792
CONFIG_DEBUG_INFO_DWARF4=y
791793
CONFIG_DEBUG_INFO_BTF=y
792794
CONFIG_GDB_SCRIPTS=y
@@ -814,6 +816,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
814816
CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
815817
CONFIG_DEBUG_PER_CPU_MAPS=y
816818
CONFIG_KFENCE=y
819+
CONFIG_KFENCE_DEFERRABLE=y
817820
CONFIG_KFENCE_STATIC_KEYS=y
818821
CONFIG_DEBUG_SHIRQ=y
819822
CONFIG_PANIC_ON_OOPS=y

arch/s390/configs/defconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,11 +490,13 @@ CONFIG_NLMON=m
490490
# CONFIG_NET_VENDOR_CHELSIO is not set
491491
# CONFIG_NET_VENDOR_CISCO is not set
492492
# CONFIG_NET_VENDOR_CORTINA is not set
493+
# CONFIG_NET_VENDOR_DAVICOM is not set
493494
# CONFIG_NET_VENDOR_DEC is not set
494495
# CONFIG_NET_VENDOR_DLINK is not set
495496
# CONFIG_NET_VENDOR_EMULEX is not set
496497
# CONFIG_NET_VENDOR_ENGLEDER is not set
497498
# CONFIG_NET_VENDOR_EZCHIP is not set
499+
# CONFIG_NET_VENDOR_FUNGIBLE is not set
498500
# CONFIG_NET_VENDOR_GOOGLE is not set
499501
# CONFIG_NET_VENDOR_HUAWEI is not set
500502
# CONFIG_NET_VENDOR_INTEL is not set
@@ -578,13 +580,13 @@ CONFIG_MLX5_INFINIBAND=m
578580
CONFIG_SYNC_FILE=y
579581
CONFIG_VFIO=m
580582
CONFIG_VFIO_PCI=m
583+
CONFIG_MLX5_VFIO_PCI=m
581584
CONFIG_VFIO_MDEV=m
582585
CONFIG_VIRTIO_PCI=m
583586
CONFIG_VIRTIO_BALLOON=m
584587
CONFIG_VIRTIO_INPUT=y
585588
CONFIG_VHOST_NET=m
586589
CONFIG_VHOST_VSOCK=m
587-
# CONFIG_SURFACE_PLATFORMS is not set
588590
CONFIG_S390_CCW_IOMMU=y
589591
CONFIG_S390_AP_IOMMU=y
590592
CONFIG_EXT4_FS=y
@@ -720,6 +722,7 @@ CONFIG_CRYPTO_MD5=y
720722
CONFIG_CRYPTO_MICHAEL_MIC=m
721723
CONFIG_CRYPTO_RMD160=m
722724
CONFIG_CRYPTO_SHA3=m
725+
CONFIG_CRYPTO_SM3=m
723726
CONFIG_CRYPTO_WP512=m
724727
CONFIG_CRYPTO_AES_TI=m
725728
CONFIG_CRYPTO_ANUBIS=m
@@ -772,7 +775,6 @@ CONFIG_DMA_CMA=y
772775
CONFIG_CMA_SIZE_MBYTES=0
773776
CONFIG_PRINTK_TIME=y
774777
CONFIG_DYNAMIC_DEBUG=y
775-
CONFIG_DEBUG_INFO=y
776778
CONFIG_DEBUG_INFO_DWARF4=y
777779
CONFIG_DEBUG_INFO_BTF=y
778780
CONFIG_GDB_SCRIPTS=y

arch/s390/configs/zfcpdump_defconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CONFIG_CRASH_DUMP=y
2626
# CONFIG_S390_GUEST is not set
2727
# CONFIG_SECCOMP is not set
2828
# CONFIG_GCC_PLUGINS is not set
29+
# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set
2930
CONFIG_PARTITION_ADVANCED=y
3031
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
3132
# CONFIG_COMPACTION is not set
@@ -60,7 +61,6 @@ CONFIG_ZFCP=y
6061
# CONFIG_HID is not set
6162
# CONFIG_VIRTIO_MENU is not set
6263
# CONFIG_VHOST_MENU is not set
63-
# CONFIG_SURFACE_PLATFORMS is not set
6464
# CONFIG_IOMMU_SUPPORT is not set
6565
# CONFIG_DNOTIFY is not set
6666
# CONFIG_INOTIFY_USER is not set
@@ -71,10 +71,10 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity"
7171
CONFIG_XZ_DEC_MICROLZMA=y
7272
CONFIG_PRINTK_TIME=y
7373
# CONFIG_SYMBOLIC_ERRNAME is not set
74-
CONFIG_DEBUG_INFO=y
74+
CONFIG_DEBUG_KERNEL=y
75+
CONFIG_DEBUG_INFO_DWARF4=y
7576
CONFIG_DEBUG_INFO_BTF=y
7677
CONFIG_DEBUG_FS=y
77-
CONFIG_DEBUG_KERNEL=y
7878
CONFIG_PANIC_ON_OOPS=y
7979
# CONFIG_SCHED_DEBUG is not set
8080
CONFIG_RCU_CPU_STALL_TIMEOUT=60

0 commit comments

Comments
 (0)