Skip to content

Commit 8d533ca

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390: update defconfigs
Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent ce9ecca commit 8d533ca

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,25 @@ CONFIG_SCHED_AUTOGROUP=y
4040
CONFIG_EXPERT=y
4141
# CONFIG_SYSFS_SYSCALL is not set
4242
CONFIG_PROFILING=y
43+
CONFIG_KEXEC_FILE=y
44+
CONFIG_KEXEC_SIG=y
45+
CONFIG_CRASH_DUMP=y
4346
CONFIG_LIVEPATCH=y
4447
CONFIG_MARCH_ZEC12=y
4548
CONFIG_TUNE_ZEC12=y
4649
CONFIG_NR_CPUS=512
4750
CONFIG_NUMA=y
4851
CONFIG_HZ_100=y
49-
CONFIG_KEXEC_FILE=y
50-
CONFIG_KEXEC_SIG=y
52+
CONFIG_CERT_STORE=y
5153
CONFIG_EXPOLINE=y
5254
CONFIG_EXPOLINE_AUTO=y
5355
CONFIG_CHSC_SCH=y
5456
CONFIG_VFIO_CCW=m
5557
CONFIG_VFIO_AP=m
56-
CONFIG_CRASH_DUMP=y
5758
CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y
5859
CONFIG_CMM=m
5960
CONFIG_APPLDATA_BASE=y
61+
CONFIG_S390_HYPFS_FS=y
6062
CONFIG_KVM=m
6163
CONFIG_S390_UNWIND_SELFTEST=m
6264
CONFIG_S390_KPROBES_SANITY_TEST=m
@@ -434,6 +436,7 @@ CONFIG_SCSI_DH_EMC=m
434436
CONFIG_SCSI_DH_ALUA=m
435437
CONFIG_MD=y
436438
CONFIG_BLK_DEV_MD=y
439+
# CONFIG_MD_BITMAP_FILE is not set
437440
CONFIG_MD_LINEAR=m
438441
CONFIG_MD_MULTIPATH=m
439442
CONFIG_MD_FAULTY=m
@@ -577,6 +580,7 @@ CONFIG_SOFT_WATCHDOG=m
577580
CONFIG_DIAG288_WATCHDOG=m
578581
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
579582
CONFIG_FB=y
583+
# CONFIG_FB_DEVICE is not set
580584
CONFIG_FRAMEBUFFER_CONSOLE=y
581585
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
582586
# CONFIG_HID_SUPPORT is not set
@@ -647,6 +651,7 @@ CONFIG_PROC_KCORE=y
647651
CONFIG_TMPFS=y
648652
CONFIG_TMPFS_POSIX_ACL=y
649653
CONFIG_TMPFS_INODE64=y
654+
CONFIG_TMPFS_QUOTA=y
650655
CONFIG_HUGETLBFS=y
651656
CONFIG_ECRYPT_FS=m
652657
CONFIG_CRAMFS=m
@@ -703,6 +708,7 @@ CONFIG_IMA_WRITE_POLICY=y
703708
CONFIG_IMA_APPRAISE=y
704709
CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
705710
CONFIG_INIT_STACK_NONE=y
711+
CONFIG_BUG_ON_DATA_CORRUPTION=y
706712
CONFIG_CRYPTO_USER=m
707713
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
708714
CONFIG_CRYPTO_PCRYPT=m
@@ -825,9 +831,9 @@ CONFIG_LOCK_STAT=y
825831
CONFIG_DEBUG_ATOMIC_SLEEP=y
826832
CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
827833
CONFIG_DEBUG_IRQFLAGS=y
834+
CONFIG_DEBUG_LIST=y
828835
CONFIG_DEBUG_SG=y
829836
CONFIG_DEBUG_NOTIFIERS=y
830-
CONFIG_BUG_ON_DATA_CORRUPTION=y
831837
CONFIG_DEBUG_CREDENTIALS=y
832838
CONFIG_RCU_TORTURE_TEST=m
833839
CONFIG_RCU_REF_SCALE_TEST=m

arch/s390/configs/defconfig

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,25 @@ CONFIG_SCHED_AUTOGROUP=y
3838
CONFIG_EXPERT=y
3939
# CONFIG_SYSFS_SYSCALL is not set
4040
CONFIG_PROFILING=y
41+
CONFIG_KEXEC_FILE=y
42+
CONFIG_KEXEC_SIG=y
43+
CONFIG_CRASH_DUMP=y
4144
CONFIG_LIVEPATCH=y
4245
CONFIG_MARCH_ZEC12=y
4346
CONFIG_TUNE_ZEC12=y
4447
CONFIG_NR_CPUS=512
4548
CONFIG_NUMA=y
4649
CONFIG_HZ_100=y
47-
CONFIG_KEXEC_FILE=y
48-
CONFIG_KEXEC_SIG=y
50+
CONFIG_CERT_STORE=y
4951
CONFIG_EXPOLINE=y
5052
CONFIG_EXPOLINE_AUTO=y
5153
CONFIG_CHSC_SCH=y
5254
CONFIG_VFIO_CCW=m
5355
CONFIG_VFIO_AP=m
54-
CONFIG_CRASH_DUMP=y
5556
CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y
5657
CONFIG_CMM=m
5758
CONFIG_APPLDATA_BASE=y
59+
CONFIG_S390_HYPFS_FS=y
5860
CONFIG_KVM=m
5961
CONFIG_S390_UNWIND_SELFTEST=m
6062
CONFIG_S390_KPROBES_SANITY_TEST=m
@@ -424,6 +426,7 @@ CONFIG_SCSI_DH_EMC=m
424426
CONFIG_SCSI_DH_ALUA=m
425427
CONFIG_MD=y
426428
CONFIG_BLK_DEV_MD=y
429+
# CONFIG_MD_BITMAP_FILE is not set
427430
CONFIG_MD_LINEAR=m
428431
CONFIG_MD_MULTIPATH=m
429432
CONFIG_MD_FAULTY=m
@@ -566,6 +569,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
566569
CONFIG_SOFT_WATCHDOG=m
567570
CONFIG_DIAG288_WATCHDOG=m
568571
CONFIG_FB=y
572+
# CONFIG_FB_DEVICE is not set
569573
CONFIG_FRAMEBUFFER_CONSOLE=y
570574
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
571575
# CONFIG_HID_SUPPORT is not set
@@ -632,6 +636,7 @@ CONFIG_PROC_KCORE=y
632636
CONFIG_TMPFS=y
633637
CONFIG_TMPFS_POSIX_ACL=y
634638
CONFIG_TMPFS_INODE64=y
639+
CONFIG_TMPFS_QUOTA=y
635640
CONFIG_HUGETLBFS=y
636641
CONFIG_CONFIGFS_FS=m
637642
CONFIG_ECRYPT_FS=m
@@ -687,6 +692,7 @@ CONFIG_IMA_WRITE_POLICY=y
687692
CONFIG_IMA_APPRAISE=y
688693
CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
689694
CONFIG_INIT_STACK_NONE=y
695+
CONFIG_BUG_ON_DATA_CORRUPTION=y
690696
CONFIG_CRYPTO_FIPS=y
691697
CONFIG_CRYPTO_USER=m
692698
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -781,7 +787,6 @@ CONFIG_PTDUMP_DEBUGFS=y
781787
CONFIG_DEBUG_MEMORY_INIT=y
782788
CONFIG_PANIC_ON_OOPS=y
783789
CONFIG_TEST_LOCKUP=m
784-
CONFIG_BUG_ON_DATA_CORRUPTION=y
785790
CONFIG_RCU_TORTURE_TEST=m
786791
CONFIG_RCU_REF_SCALE_TEST=m
787792
CONFIG_RCU_CPU_STALL_TIMEOUT=60

arch/s390/configs/zfcpdump_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ CONFIG_BPF_SYSCALL=y
88
# CONFIG_NET_NS is not set
99
CONFIG_BLK_DEV_INITRD=y
1010
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
11+
CONFIG_CRASH_DUMP=y
1112
CONFIG_MARCH_ZEC12=y
1213
CONFIG_TUNE_ZEC12=y
1314
# CONFIG_COMPAT is not set
1415
CONFIG_NR_CPUS=2
1516
CONFIG_HZ_100=y
1617
# CONFIG_CHSC_SCH is not set
1718
# CONFIG_SCM_BUS is not set
18-
CONFIG_CRASH_DUMP=y
1919
# CONFIG_PFAULT is not set
20-
# CONFIG_S390_HYPFS_FS is not set
20+
# CONFIG_S390_HYPFS is not set
2121
# CONFIG_VIRTUALIZATION is not set
2222
# CONFIG_S390_GUEST is not set
2323
# CONFIG_SECCOMP is not set

0 commit comments

Comments
 (0)