Commit 8d533cac 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 ce9ecca0

arch/s390/configs/debug_defconfig

+10 −4
Original line number Diff line number Diff line
@@ -40,23 +40,25 @@ CONFIG_SCHED_AUTOGROUP=y 
CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_PROFILING=y

CONFIG_KEXEC_FILE=y

CONFIG_KEXEC_SIG=y

CONFIG_CRASH_DUMP=y

CONFIG_LIVEPATCH=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

CONFIG_HZ_100=y

CONFIG_KEXEC_FILE=y

CONFIG_KEXEC_SIG=y

CONFIG_CERT_STORE=y

CONFIG_EXPOLINE=y

CONFIG_EXPOLINE_AUTO=y

CONFIG_CHSC_SCH=y

CONFIG_VFIO_CCW=m

CONFIG_VFIO_AP=m

CONFIG_CRASH_DUMP=y

CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y

CONFIG_CMM=m

CONFIG_APPLDATA_BASE=y

CONFIG_S390_HYPFS_FS=y

CONFIG_KVM=m

CONFIG_S390_UNWIND_SELFTEST=m

CONFIG_S390_KPROBES_SANITY_TEST=m
@@ -434,6 +436,7 @@ CONFIG_SCSI_DH_EMC=m 
CONFIG_SCSI_DH_ALUA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m
@@ -577,6 +580,7 @@ CONFIG_SOFT_WATCHDOG=m 
CONFIG_DIAG288_WATCHDOG=m

# CONFIG_DRM_DEBUG_MODESET_LOCK is not set

CONFIG_FB=y

# CONFIG_FB_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID_SUPPORT is not set
@@ -647,6 +651,7 @@ CONFIG_PROC_KCORE=y 
CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_TMPFS_INODE64=y

CONFIG_TMPFS_QUOTA=y

CONFIG_HUGETLBFS=y

CONFIG_ECRYPT_FS=m

CONFIG_CRAMFS=m
@@ -703,6 +708,7 @@ CONFIG_IMA_WRITE_POLICY=y 
CONFIG_IMA_APPRAISE=y

CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

CONFIG_INIT_STACK_NONE=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_PCRYPT=m
@@ -825,9 +831,9 @@ CONFIG_LOCK_STAT=y 
CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_LOCKING_API_SELFTESTS=y

CONFIG_DEBUG_IRQFLAGS=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_SG=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_DEBUG_CREDENTIALS=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_REF_SCALE_TEST=m

arch/s390/configs/defconfig

+9 −4
Original line number Diff line number Diff line
@@ -38,23 +38,25 @@ CONFIG_SCHED_AUTOGROUP=y 
CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_PROFILING=y

CONFIG_KEXEC_FILE=y

CONFIG_KEXEC_SIG=y

CONFIG_CRASH_DUMP=y

CONFIG_LIVEPATCH=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

CONFIG_HZ_100=y

CONFIG_KEXEC_FILE=y

CONFIG_KEXEC_SIG=y

CONFIG_CERT_STORE=y

CONFIG_EXPOLINE=y

CONFIG_EXPOLINE_AUTO=y

CONFIG_CHSC_SCH=y

CONFIG_VFIO_CCW=m

CONFIG_VFIO_AP=m

CONFIG_CRASH_DUMP=y

CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y

CONFIG_CMM=m

CONFIG_APPLDATA_BASE=y

CONFIG_S390_HYPFS_FS=y

CONFIG_KVM=m

CONFIG_S390_UNWIND_SELFTEST=m

CONFIG_S390_KPROBES_SANITY_TEST=m
@@ -424,6 +426,7 @@ CONFIG_SCSI_DH_EMC=m 
CONFIG_SCSI_DH_ALUA=m

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m
@@ -566,6 +569,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y 
CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

CONFIG_FB=y

# CONFIG_FB_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID_SUPPORT is not set
@@ -632,6 +636,7 @@ CONFIG_PROC_KCORE=y 
CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_TMPFS_INODE64=y

CONFIG_TMPFS_QUOTA=y

CONFIG_HUGETLBFS=y

CONFIG_CONFIGFS_FS=m

CONFIG_ECRYPT_FS=m
@@ -687,6 +692,7 @@ CONFIG_IMA_WRITE_POLICY=y 
CONFIG_IMA_APPRAISE=y

CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

CONFIG_INIT_STACK_NONE=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CRYPTO_FIPS=y

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -781,7 +787,6 @@ CONFIG_PTDUMP_DEBUGFS=y 
CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_TEST_LOCKUP=m

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_REF_SCALE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=60

arch/s390/configs/zfcpdump_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y 
# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CRASH_DUMP=y

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

# CONFIG_COMPAT is not set
@@ -15,9 +16,8 @@ CONFIG_NR_CPUS=2 
CONFIG_HZ_100=y

# CONFIG_CHSC_SCH is not set

# CONFIG_SCM_BUS is not set

CONFIG_CRASH_DUMP=y

# CONFIG_PFAULT is not set

# CONFIG_S390_HYPFS_FS is not set

# CONFIG_S390_HYPFS is not set

# CONFIG_VIRTUALIZATION is not set

# CONFIG_S390_GUEST is not set

# CONFIG_SECCOMP is not set