Commit 4b26ceac authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390: update defconfigs 



Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent d76b14f3

arch/s390/configs/debug_defconfig

+5 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CONFIG_BPF_JIT=y 
CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_BPF_LSM=y

CONFIG_PREEMPT=y

CONFIG_SCHED_CORE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_TASKSTATS=y
@@ -503,6 +504,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_LITEX is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m
@@ -661,7 +663,6 @@ CONFIG_NFSD_V3_ACL=y 
CONFIG_NFSD_V4=y

CONFIG_NFSD_V4_SECURITY_LABEL=y

CONFIG_CIFS=m

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_UPCALL=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y
@@ -720,6 +721,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m
@@ -774,7 +777,6 @@ CONFIG_RANDOM32_SELFTEST=y 
CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_DMA_API_DEBUG=y

CONFIG_STRING_SELFTEST=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y
@@ -853,12 +855,12 @@ CONFIG_FAIL_FUNCTION=y 
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LKDTM=m

CONFIG_TEST_MIN_HEAP=y

CONFIG_TEST_SORT=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_RBTREE_TEST=y

CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_STRING_SELFTEST=y

CONFIG_TEST_BITOPS=m

CONFIG_TEST_BPF=m

CONFIG_TEST_LIVEPATCH=m

arch/s390/configs/defconfig

+4 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y 
CONFIG_BPF_JIT=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_BPF_LSM=y

CONFIG_SCHED_CORE=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_TASKSTATS=y
@@ -494,6 +495,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_LITEX is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m
@@ -648,7 +650,6 @@ CONFIG_NFSD_V3_ACL=y 
CONFIG_NFSD_V4=y

CONFIG_NFSD_V4_SECURITY_LABEL=y

CONFIG_CIFS=m

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_CIFS_UPCALL=y

CONFIG_CIFS_XATTR=y

CONFIG_CIFS_POSIX=y
@@ -708,6 +709,8 @@ CONFIG_CRYPTO_XCBC=m 
CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m