Commit c3d9cdca authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: update defconfigs 



Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent cfef9aa6

arch/s390/configs/debug_defconfig

+6 −4
Original line number Diff line number Diff line
@@ -93,9 +93,10 @@ CONFIG_CLEANCACHE=y 
CONFIG_FRONTSWAP=y

CONFIG_CMA_DEBUG=y

CONFIG_CMA_DEBUGFS=y

CONFIG_CMA_AREAS=7

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC=m

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_DEFERRED_STRUCT_PAGE_INIT=y

CONFIG_IDLE_PAGE_TRACKING=y
@@ -378,7 +379,6 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

# CONFIG_NET_DROP_MONITOR is not set

CONFIG_PCI=y

# CONFIG_PCIEASPM is not set

CONFIG_PCI_DEBUG=y
@@ -386,7 +386,7 @@ CONFIG_HOTPLUG_PCI=y 
CONFIG_HOTPLUG_PCI_S390=y

CONFIG_DEVTMPFS=y

CONFIG_CONNECTOR=y

CONFIG_ZRAM=m

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m
@@ -689,6 +689,7 @@ CONFIG_CRYPTO_TEST=m 
CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_CHACHA20POLY1305=m
@@ -709,7 +710,6 @@ CONFIG_CRYPTO_RMD160=m 
CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -753,6 +753,7 @@ CONFIG_CRYPTO_DES_S390=m 
CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_CORDIC=m

CONFIG_CRC32_SELFTEST=y

CONFIG_CRC4=m
@@ -829,6 +830,7 @@ CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m 
CONFIG_FAULT_INJECTION=y

CONFIG_FAILSLAB=y

CONFIG_FAIL_PAGE_ALLOC=y

CONFIG_FAULT_INJECTION_USERCOPY=y

CONFIG_FAIL_MAKE_REQUEST=y

CONFIG_FAIL_IO_TIMEOUT=y

CONFIG_FAIL_FUTEX=y

arch/s390/configs/defconfig

+5 −4
Original line number Diff line number Diff line
@@ -87,9 +87,10 @@ CONFIG_KSM=y 
CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CLEANCACHE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA_AREAS=7

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC=m

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_DEFERRED_STRUCT_PAGE_INIT=y

CONFIG_IDLE_PAGE_TRACKING=y
@@ -371,7 +372,6 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

# CONFIG_NET_DROP_MONITOR is not set

CONFIG_PCI=y

# CONFIG_PCIEASPM is not set

CONFIG_HOTPLUG_PCI=y
@@ -379,7 +379,7 @@ CONFIG_HOTPLUG_PCI_S390=y 
CONFIG_UEVENT_HELPER=y

CONFIG_DEVTMPFS=y

CONFIG_CONNECTOR=y

CONFIG_ZRAM=m

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m
@@ -680,6 +680,7 @@ CONFIG_CRYPTO_TEST=m 
CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_CHACHA20POLY1305=m
@@ -701,7 +702,6 @@ CONFIG_CRYPTO_RMD160=m 
CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m
@@ -745,6 +745,7 @@ CONFIG_CRYPTO_DES_S390=m 
CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_CORDIC=m

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC4=m

arch/s390/configs/zfcpdump_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ CONFIG_HZ_100=y 
# CONFIG_CHSC_SCH is not set

# CONFIG_SCM_BUS is not set

CONFIG_CRASH_DUMP=y

# CONFIG_SECCOMP is not set

# CONFIG_PFAULT is not set

# CONFIG_S390_HYPFS_FS is not set

# CONFIG_VIRTUALIZATION is not set

# CONFIG_S390_GUEST is not set

# CONFIG_SECCOMP is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set