Commit 80abb39b authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: update defconfig 



Enable the contiguous memory allocator but set the default size to
zero. If somebody wants to use the cma allocator the "cma=" kernel
parameter has to be used.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e1231b0e

arch/s390/configs/default_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ CONFIG_TRANSPARENT_HUGEPAGE=y 
CONFIG_CLEANCACHE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA=y

CONFIG_CMA_DEBUG=y

CONFIG_CMA_DEBUGFS=y

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZPOOL=m

CONFIG_ZBUD=m
@@ -366,6 +368,8 @@ CONFIG_BPF_JIT=y 
CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m

CONFIG_DEVTMPFS=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_CONNECTOR=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -438,7 +442,6 @@ CONFIG_TUN=m 
CONFIG_VETH=m

CONFIG_VIRTIO_NET=m

CONFIG_NLMON=m

CONFIG_VHOST_NET=m

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -693,3 +696,4 @@ CONFIG_CMM=m 
CONFIG_APPLDATA_BASE=y

CONFIG_KVM=m

CONFIG_KVM_S390_UCONTROL=y

CONFIG_VHOST_NET=m

arch/s390/configs/gcov_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ CONFIG_BPF_JIT=y 
CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m

CONFIG_DEVTMPFS=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_CONNECTOR=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -434,7 +436,6 @@ CONFIG_TUN=m 
CONFIG_VETH=m

CONFIG_VIRTIO_NET=m

CONFIG_NLMON=m

CONFIG_VHOST_NET=m

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -633,3 +634,4 @@ CONFIG_CMM=m 
CONFIG_APPLDATA_BASE=y

CONFIG_KVM=m

CONFIG_KVM_S390_UCONTROL=y

CONFIG_VHOST_NET=m

arch/s390/configs/performance_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -362,6 +362,8 @@ CONFIG_BPF_JIT=y 
CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m

CONFIG_DEVTMPFS=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_CONNECTOR=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -434,7 +436,6 @@ CONFIG_TUN=m 
CONFIG_VETH=m

CONFIG_VIRTIO_NET=m

CONFIG_NLMON=m

CONFIG_VHOST_NET=m

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -632,3 +633,4 @@ CONFIG_CMM=m 
CONFIG_APPLDATA_BASE=y

CONFIG_KVM=m

CONFIG_KVM_S390_UCONTROL=y

CONFIG_VHOST_NET=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE