Skip to content

Commit b4fa00f

Browse files
committed
s390: Update defconfigs
Signed-off-by: Heiko Carstens <[email protected]>
1 parent 223e7fb commit b4fa00f

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ CONFIG_NUMA=y
5050
CONFIG_HZ_100=y
5151
CONFIG_CERT_STORE=y
5252
CONFIG_EXPOLINE=y
53-
# CONFIG_EXPOLINE_EXTERN is not set
5453
CONFIG_EXPOLINE_AUTO=y
5554
CONFIG_CHSC_SCH=y
5655
CONFIG_VFIO_CCW=m
@@ -95,6 +94,7 @@ CONFIG_BINFMT_MISC=m
9594
CONFIG_ZSWAP=y
9695
CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
9796
CONFIG_ZSMALLOC_STAT=y
97+
CONFIG_SLAB_BUCKETS=y
9898
CONFIG_SLUB_STATS=y
9999
# CONFIG_COMPAT_BRK is not set
100100
CONFIG_MEMORY_HOTPLUG=y
@@ -426,6 +426,13 @@ CONFIG_DEVTMPFS_SAFE=y
426426
# CONFIG_FW_LOADER is not set
427427
CONFIG_CONNECTOR=y
428428
CONFIG_ZRAM=y
429+
CONFIG_ZRAM_BACKEND_LZ4=y
430+
CONFIG_ZRAM_BACKEND_LZ4HC=y
431+
CONFIG_ZRAM_BACKEND_ZSTD=y
432+
CONFIG_ZRAM_BACKEND_DEFLATE=y
433+
CONFIG_ZRAM_BACKEND_842=y
434+
CONFIG_ZRAM_BACKEND_LZO=y
435+
CONFIG_ZRAM_DEF_COMP_DEFLATE=y
429436
CONFIG_BLK_DEV_LOOP=m
430437
CONFIG_BLK_DEV_DRBD=m
431438
CONFIG_BLK_DEV_NBD=m
@@ -486,6 +493,7 @@ CONFIG_DM_UEVENT=y
486493
CONFIG_DM_FLAKEY=m
487494
CONFIG_DM_VERITY=m
488495
CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
496+
CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING=y
489497
CONFIG_DM_SWITCH=m
490498
CONFIG_DM_INTEGRITY=m
491499
CONFIG_DM_VDO=m
@@ -535,6 +543,7 @@ CONFIG_NLMON=m
535543
CONFIG_MLX4_EN=m
536544
CONFIG_MLX5_CORE=m
537545
CONFIG_MLX5_CORE_EN=y
546+
# CONFIG_NET_VENDOR_META is not set
538547
# CONFIG_NET_VENDOR_MICREL is not set
539548
# CONFIG_NET_VENDOR_MICROCHIP is not set
540549
# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -695,6 +704,7 @@ CONFIG_NFSD=m
695704
CONFIG_NFSD_V3_ACL=y
696705
CONFIG_NFSD_V4=y
697706
CONFIG_NFSD_V4_SECURITY_LABEL=y
707+
# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
698708
CONFIG_CIFS=m
699709
CONFIG_CIFS_UPCALL=y
700710
CONFIG_CIFS_XATTR=y
@@ -740,7 +750,6 @@ CONFIG_CRYPTO_DH=m
740750
CONFIG_CRYPTO_ECDH=m
741751
CONFIG_CRYPTO_ECDSA=m
742752
CONFIG_CRYPTO_ECRDSA=m
743-
CONFIG_CRYPTO_SM2=m
744753
CONFIG_CRYPTO_CURVE25519=m
745754
CONFIG_CRYPTO_AES_TI=m
746755
CONFIG_CRYPTO_ANUBIS=m

arch/s390/configs/defconfig

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ CONFIG_NUMA=y
4848
CONFIG_HZ_100=y
4949
CONFIG_CERT_STORE=y
5050
CONFIG_EXPOLINE=y
51-
# CONFIG_EXPOLINE_EXTERN is not set
5251
CONFIG_EXPOLINE_AUTO=y
5352
CONFIG_CHSC_SCH=y
5453
CONFIG_VFIO_CCW=m
@@ -89,6 +88,7 @@ CONFIG_BINFMT_MISC=m
8988
CONFIG_ZSWAP=y
9089
CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
9190
CONFIG_ZSMALLOC_STAT=y
91+
CONFIG_SLAB_BUCKETS=y
9292
# CONFIG_COMPAT_BRK is not set
9393
CONFIG_MEMORY_HOTPLUG=y
9494
CONFIG_MEMORY_HOTREMOVE=y
@@ -416,6 +416,13 @@ CONFIG_DEVTMPFS_SAFE=y
416416
# CONFIG_FW_LOADER is not set
417417
CONFIG_CONNECTOR=y
418418
CONFIG_ZRAM=y
419+
CONFIG_ZRAM_BACKEND_LZ4=y
420+
CONFIG_ZRAM_BACKEND_LZ4HC=y
421+
CONFIG_ZRAM_BACKEND_ZSTD=y
422+
CONFIG_ZRAM_BACKEND_DEFLATE=y
423+
CONFIG_ZRAM_BACKEND_842=y
424+
CONFIG_ZRAM_BACKEND_LZO=y
425+
CONFIG_ZRAM_DEF_COMP_DEFLATE=y
419426
CONFIG_BLK_DEV_LOOP=m
420427
CONFIG_BLK_DEV_DRBD=m
421428
CONFIG_BLK_DEV_NBD=m
@@ -476,6 +483,7 @@ CONFIG_DM_UEVENT=y
476483
CONFIG_DM_FLAKEY=m
477484
CONFIG_DM_VERITY=m
478485
CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
486+
CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING=y
479487
CONFIG_DM_SWITCH=m
480488
CONFIG_DM_INTEGRITY=m
481489
CONFIG_DM_VDO=m
@@ -525,6 +533,7 @@ CONFIG_NLMON=m
525533
CONFIG_MLX4_EN=m
526534
CONFIG_MLX5_CORE=m
527535
CONFIG_MLX5_CORE_EN=y
536+
# CONFIG_NET_VENDOR_META is not set
528537
# CONFIG_NET_VENDOR_MICREL is not set
529538
# CONFIG_NET_VENDOR_MICROCHIP is not set
530539
# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -682,6 +691,7 @@ CONFIG_NFSD=m
682691
CONFIG_NFSD_V3_ACL=y
683692
CONFIG_NFSD_V4=y
684693
CONFIG_NFSD_V4_SECURITY_LABEL=y
694+
# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
685695
CONFIG_CIFS=m
686696
CONFIG_CIFS_UPCALL=y
687697
CONFIG_CIFS_XATTR=y
@@ -726,7 +736,6 @@ CONFIG_CRYPTO_DH=m
726736
CONFIG_CRYPTO_ECDH=m
727737
CONFIG_CRYPTO_ECDSA=m
728738
CONFIG_CRYPTO_ECRDSA=m
729-
CONFIG_CRYPTO_SM2=m
730739
CONFIG_CRYPTO_CURVE25519=m
731740
CONFIG_CRYPTO_AES_TI=m
732741
CONFIG_CRYPTO_ANUBIS=m
@@ -767,6 +776,7 @@ CONFIG_CRYPTO_LZ4=m
767776
CONFIG_CRYPTO_LZ4HC=m
768777
CONFIG_CRYPTO_ZSTD=m
769778
CONFIG_CRYPTO_ANSI_CPRNG=m
779+
CONFIG_CRYPTO_JITTERENTROPY_OSR=1
770780
CONFIG_CRYPTO_USER_API_HASH=m
771781
CONFIG_CRYPTO_USER_API_SKCIPHER=m
772782
CONFIG_CRYPTO_USER_API_RNG=m

arch/s390/configs/zfcpdump_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ CONFIG_ZFCP=y
4949
# CONFIG_HVC_IUCV is not set
5050
# CONFIG_HW_RANDOM_S390 is not set
5151
# CONFIG_HMC_DRV is not set
52+
# CONFIG_S390_UV_UAPI is not set
5253
# CONFIG_S390_TAPE is not set
5354
# CONFIG_VMCP is not set
5455
# CONFIG_MONWRITER is not set

0 commit comments

Comments
 (0)