Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe3af625 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

s390: update defconfig 



Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 496da0d7

arch/s390/configs/default_defconfig

+4 −7
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ CONFIG_KSM=y 
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
@@ -379,7 +378,6 @@ CONFIG_BLK_DEV_LOOP=m 
CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_OSD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_BLK_DEV_RAM_DAX=y
@@ -416,7 +414,6 @@ CONFIG_SCSI_OSD_ULD=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_BLK_DEV_DM=m
@@ -483,6 +480,8 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y
@@ -599,7 +598,6 @@ CONFIG_DETECT_HUNG_TASK=y 
CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_DEBUG_TIMEKEEPING=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y
@@ -629,10 +627,8 @@ CONFIG_SCHED_TRACER=y 
CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENTS=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_LKDTM=m

CONFIG_TEST_LIST_SORT=y

CONFIG_TEST_SORT=y
@@ -649,6 +645,7 @@ CONFIG_ENCRYPTED_KEYS=m 
CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -705,12 +702,12 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

arch/s390/configs/gcov_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ CONFIG_KSM=y 
CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CLEANCACHE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA=y

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZBUD=m
@@ -376,7 +375,6 @@ CONFIG_BLK_DEV_LOOP=m 
CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_OSD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_BLK_DEV_RAM_DAX=y
@@ -412,7 +410,6 @@ CONFIG_SCSI_OSD_ULD=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_BLK_DEV_DM=m
@@ -479,6 +476,8 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y
@@ -575,10 +574,8 @@ CONFIG_SCHED_TRACER=y 
CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENTS=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_LKDTM=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y
@@ -650,12 +647,12 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRC7=m

arch/s390/configs/performance_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ CONFIG_KSM=y 
CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CLEANCACHE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA=y

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZBUD=m
@@ -374,7 +373,6 @@ CONFIG_BLK_DEV_LOOP=m 
CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_OSD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_BLK_DEV_RAM_DAX=y
@@ -410,7 +408,6 @@ CONFIG_SCSI_OSD_ULD=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_BLK_DEV_DM=m
@@ -477,6 +474,8 @@ CONFIG_INFINIBAND=m 
CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y
@@ -573,10 +572,8 @@ CONFIG_SCHED_TRACER=y 
CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENTS=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_LKDTM=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y
@@ -648,12 +645,12 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRC7=m

arch/s390/defconfig

+0 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ CONFIG_KSM=y 
CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CLEANCACHE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA=y

CONFIG_ZSWAP=y

CONFIG_ZBUD=m

CONFIG_ZSMALLOC=m
@@ -163,7 +162,6 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y

CONFIG_DEBUG_LOCKDEP=y
@@ -179,7 +177,6 @@ CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y 
CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_S390_PTDUMP=y

CONFIG_CRYPTO_CRYPTD=m