Commit 3d940bb1 authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

s390: update defconfigs 



Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent e6b2dab4

arch/s390/configs/debug_defconfig

+5 −4
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ CONFIG_KEXEC_FILE=y 
CONFIG_KEXEC_SIG=y

CONFIG_CRASH_DUMP=y

CONFIG_LIVEPATCH=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

CONFIG_MARCH_Z13=y

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

CONFIG_HZ_100=y
@@ -76,7 +75,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SIG_SHA256=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -93,6 +91,7 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLUB_STATS=y

# CONFIG_COMPAT_BRK is not set
@@ -619,6 +618,9 @@ CONFIG_BTRFS_FS_POSIX_ACL=y 
CONFIG_BTRFS_DEBUG=y

CONFIG_BTRFS_ASSERT=y

CONFIG_NILFS2_FS=m

CONFIG_BCACHEFS_FS=y

CONFIG_BCACHEFS_QUOTA=y

CONFIG_BCACHEFS_POSIX_ACL=y

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y
@@ -691,7 +693,6 @@ CONFIG_PERSISTENT_KEYRINGS=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

arch/s390/configs/defconfig

+5 −4
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ CONFIG_KEXEC_FILE=y 
CONFIG_KEXEC_SIG=y

CONFIG_CRASH_DUMP=y

CONFIG_LIVEPATCH=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

CONFIG_MARCH_Z13=y

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

CONFIG_HZ_100=y
@@ -71,7 +70,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SIG_SHA256=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -88,6 +86,7 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y

CONFIG_ZSMALLOC_STAT=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MEMORY_HOTPLUG=y
@@ -605,6 +604,9 @@ CONFIG_OCFS2_FS=m 
CONFIG_BTRFS_FS=y

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_NILFS2_FS=m

CONFIG_BCACHEFS_FS=m

CONFIG_BCACHEFS_QUOTA=y

CONFIG_BCACHEFS_POSIX_ACL=y

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y
@@ -677,7 +679,6 @@ CONFIG_PERSISTENT_KEYRINGS=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_LOCKDOWN_LSM=y

arch/s390/configs/zfcpdump_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ CONFIG_BPF_SYSCALL=y 
CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CRASH_DUMP=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

CONFIG_MARCH_Z13=y

# CONFIG_COMPAT is not set

CONFIG_NR_CPUS=2

CONFIG_HZ_100=y