Skip to content

Commit 4b26cea

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390: update defconfigs
Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent d76b14f commit 4b26cea

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CONFIG_BPF_JIT=y
1010
CONFIG_BPF_JIT_ALWAYS_ON=y
1111
CONFIG_BPF_LSM=y
1212
CONFIG_PREEMPT=y
13+
CONFIG_SCHED_CORE=y
1314
CONFIG_BSD_PROCESS_ACCT=y
1415
CONFIG_BSD_PROCESS_ACCT_V3=y
1516
CONFIG_TASKSTATS=y
@@ -503,6 +504,7 @@ CONFIG_NLMON=m
503504
# CONFIG_NET_VENDOR_HUAWEI is not set
504505
# CONFIG_NET_VENDOR_INTEL is not set
505506
# CONFIG_NET_VENDOR_MICROSOFT is not set
507+
# CONFIG_NET_VENDOR_LITEX is not set
506508
# CONFIG_NET_VENDOR_MARVELL is not set
507509
CONFIG_MLX4_EN=m
508510
CONFIG_MLX5_CORE=m
@@ -661,7 +663,6 @@ CONFIG_NFSD_V3_ACL=y
661663
CONFIG_NFSD_V4=y
662664
CONFIG_NFSD_V4_SECURITY_LABEL=y
663665
CONFIG_CIFS=m
664-
CONFIG_CIFS_WEAK_PW_HASH=y
665666
CONFIG_CIFS_UPCALL=y
666667
CONFIG_CIFS_XATTR=y
667668
CONFIG_CIFS_POSIX=y
@@ -720,6 +721,8 @@ CONFIG_CRYPTO_XCBC=m
720721
CONFIG_CRYPTO_VMAC=m
721722
CONFIG_CRYPTO_CRC32=m
722723
CONFIG_CRYPTO_BLAKE2S=m
724+
CONFIG_CRYPTO_MD4=m
725+
CONFIG_CRYPTO_MD5=y
723726
CONFIG_CRYPTO_MICHAEL_MIC=m
724727
CONFIG_CRYPTO_RMD160=m
725728
CONFIG_CRYPTO_SHA3=m
@@ -774,7 +777,6 @@ CONFIG_RANDOM32_SELFTEST=y
774777
CONFIG_DMA_CMA=y
775778
CONFIG_CMA_SIZE_MBYTES=0
776779
CONFIG_DMA_API_DEBUG=y
777-
CONFIG_STRING_SELFTEST=y
778780
CONFIG_PRINTK_TIME=y
779781
CONFIG_DYNAMIC_DEBUG=y
780782
CONFIG_DEBUG_INFO=y
@@ -853,12 +855,12 @@ CONFIG_FAIL_FUNCTION=y
853855
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
854856
CONFIG_LKDTM=m
855857
CONFIG_TEST_MIN_HEAP=y
856-
CONFIG_TEST_SORT=y
857858
CONFIG_KPROBES_SANITY_TEST=y
858859
CONFIG_RBTREE_TEST=y
859860
CONFIG_INTERVAL_TREE_TEST=m
860861
CONFIG_PERCPU_TEST=m
861862
CONFIG_ATOMIC64_SELFTEST=y
863+
CONFIG_STRING_SELFTEST=y
862864
CONFIG_TEST_BITOPS=m
863865
CONFIG_TEST_BPF=m
864866
CONFIG_TEST_LIVEPATCH=m

arch/s390/configs/defconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y
88
CONFIG_BPF_JIT=y
99
CONFIG_BPF_JIT_ALWAYS_ON=y
1010
CONFIG_BPF_LSM=y
11+
CONFIG_SCHED_CORE=y
1112
CONFIG_BSD_PROCESS_ACCT=y
1213
CONFIG_BSD_PROCESS_ACCT_V3=y
1314
CONFIG_TASKSTATS=y
@@ -494,6 +495,7 @@ CONFIG_NLMON=m
494495
# CONFIG_NET_VENDOR_HUAWEI is not set
495496
# CONFIG_NET_VENDOR_INTEL is not set
496497
# CONFIG_NET_VENDOR_MICROSOFT is not set
498+
# CONFIG_NET_VENDOR_LITEX is not set
497499
# CONFIG_NET_VENDOR_MARVELL is not set
498500
CONFIG_MLX4_EN=m
499501
CONFIG_MLX5_CORE=m
@@ -648,7 +650,6 @@ CONFIG_NFSD_V3_ACL=y
648650
CONFIG_NFSD_V4=y
649651
CONFIG_NFSD_V4_SECURITY_LABEL=y
650652
CONFIG_CIFS=m
651-
CONFIG_CIFS_WEAK_PW_HASH=y
652653
CONFIG_CIFS_UPCALL=y
653654
CONFIG_CIFS_XATTR=y
654655
CONFIG_CIFS_POSIX=y
@@ -708,6 +709,8 @@ CONFIG_CRYPTO_XCBC=m
708709
CONFIG_CRYPTO_VMAC=m
709710
CONFIG_CRYPTO_CRC32=m
710711
CONFIG_CRYPTO_BLAKE2S=m
712+
CONFIG_CRYPTO_MD4=m
713+
CONFIG_CRYPTO_MD5=y
711714
CONFIG_CRYPTO_MICHAEL_MIC=m
712715
CONFIG_CRYPTO_RMD160=m
713716
CONFIG_CRYPTO_SHA3=m

0 commit comments

Comments
 (0)