Skip to content

Commit 9e9f85e

Browse files
committed
s390: update defconfigs
Signed-off-by: Heiko Carstens <[email protected]>
1 parent 5aa9887 commit 9e9f85e

File tree

3 files changed

+73
-19
lines changed

3 files changed

+73
-19
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_SYSVIPC=y
22
CONFIG_POSIX_MQUEUE=y
3+
CONFIG_WATCH_QUEUE=y
34
CONFIG_AUDIT=y
45
CONFIG_NO_HZ_IDLE=y
56
CONFIG_HIGH_RES_TIMERS=y
@@ -14,7 +15,6 @@ CONFIG_IKCONFIG=y
1415
CONFIG_IKCONFIG_PROC=y
1516
CONFIG_NUMA_BALANCING=y
1617
CONFIG_MEMCG=y
17-
CONFIG_MEMCG_SWAP=y
1818
CONFIG_BLK_CGROUP=y
1919
CONFIG_CFS_BANDWIDTH=y
2020
CONFIG_RT_GROUP_SCHED=y
@@ -31,9 +31,9 @@ CONFIG_NAMESPACES=y
3131
CONFIG_USER_NS=y
3232
CONFIG_CHECKPOINT_RESTORE=y
3333
CONFIG_SCHED_AUTOGROUP=y
34-
CONFIG_BLK_DEV_INITRD=y
3534
CONFIG_EXPERT=y
3635
# CONFIG_SYSFS_SYSCALL is not set
36+
CONFIG_BPF_LSM=y
3737
CONFIG_BPF_SYSCALL=y
3838
CONFIG_USERFAULTFD=y
3939
# CONFIG_COMPAT_BRK is not set
@@ -51,14 +51,11 @@ CONFIG_CHSC_SCH=y
5151
CONFIG_VFIO_CCW=m
5252
CONFIG_VFIO_AP=m
5353
CONFIG_CRASH_DUMP=y
54-
CONFIG_HIBERNATION=y
55-
CONFIG_PM_DEBUG=y
5654
CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y
5755
CONFIG_CMM=m
5856
CONFIG_APPLDATA_BASE=y
5957
CONFIG_KVM=m
60-
CONFIG_VHOST_NET=m
61-
CONFIG_VHOST_VSOCK=m
58+
CONFIG_S390_UNWIND_SELFTEST=y
6259
CONFIG_OPROFILE=m
6360
CONFIG_KPROBES=y
6461
CONFIG_JUMP_LABEL=y
@@ -77,6 +74,8 @@ CONFIG_BLK_DEV_THROTTLING=y
7774
CONFIG_BLK_WBT=y
7875
CONFIG_BLK_CGROUP_IOLATENCY=y
7976
CONFIG_BLK_CGROUP_IOCOST=y
77+
CONFIG_BLK_INLINE_ENCRYPTION=y
78+
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
8079
CONFIG_PARTITION_ADVANCED=y
8180
CONFIG_IBM_PARTITION=y
8281
CONFIG_BSD_DISKLABEL=y
@@ -96,7 +95,6 @@ CONFIG_CMA_DEBUG=y
9695
CONFIG_CMA_DEBUGFS=y
9796
CONFIG_MEM_SOFT_DIRTY=y
9897
CONFIG_ZSWAP=y
99-
CONFIG_ZBUD=m
10098
CONFIG_ZSMALLOC=m
10199
CONFIG_ZSMALLOC_STAT=y
102100
CONFIG_DEFERRED_STRUCT_PAGE_INIT=y
@@ -130,6 +128,7 @@ CONFIG_SYN_COOKIES=y
130128
CONFIG_NET_IPVTI=m
131129
CONFIG_INET_AH=m
132130
CONFIG_INET_ESP=m
131+
CONFIG_INET_ESPINTCP=y
133132
CONFIG_INET_IPCOMP=m
134133
CONFIG_INET_DIAG=m
135134
CONFIG_INET_UDP_DIAG=m
@@ -144,14 +143,18 @@ CONFIG_TCP_CONG_ILLINOIS=m
144143
CONFIG_IPV6_ROUTER_PREF=y
145144
CONFIG_INET6_AH=m
146145
CONFIG_INET6_ESP=m
146+
CONFIG_INET6_ESPINTCP=y
147147
CONFIG_INET6_IPCOMP=m
148148
CONFIG_IPV6_MIP6=m
149149
CONFIG_IPV6_VTI=m
150150
CONFIG_IPV6_SIT=m
151151
CONFIG_IPV6_GRE=m
152152
CONFIG_IPV6_MULTIPLE_TABLES=y
153153
CONFIG_IPV6_SUBTREES=y
154+
CONFIG_IPV6_RPL_LWTUNNEL=y
155+
CONFIG_MPTCP=y
154156
CONFIG_NETFILTER=y
157+
CONFIG_BRIDGE_NETFILTER=m
155158
CONFIG_NF_CONNTRACK=m
156159
CONFIG_NF_CONNTRACK_SECMARK=y
157160
CONFIG_NF_CONNTRACK_EVENTS=y
@@ -317,6 +320,7 @@ CONFIG_L2TP_V3=y
317320
CONFIG_L2TP_IP=m
318321
CONFIG_L2TP_ETH=m
319322
CONFIG_BRIDGE=m
323+
CONFIG_BRIDGE_MRP=y
320324
CONFIG_VLAN_8021Q=m
321325
CONFIG_VLAN_8021Q_GVRP=y
322326
CONFIG_NET_SCHED=y
@@ -341,6 +345,7 @@ CONFIG_NET_SCH_CODEL=m
341345
CONFIG_NET_SCH_FQ_CODEL=m
342346
CONFIG_NET_SCH_INGRESS=m
343347
CONFIG_NET_SCH_PLUG=m
348+
CONFIG_NET_SCH_ETS=m
344349
CONFIG_NET_CLS_BASIC=m
345350
CONFIG_NET_CLS_TCINDEX=m
346351
CONFIG_NET_CLS_ROUTE4=m
@@ -364,6 +369,7 @@ CONFIG_NET_ACT_PEDIT=m
364369
CONFIG_NET_ACT_SIMP=m
365370
CONFIG_NET_ACT_SKBEDIT=m
366371
CONFIG_NET_ACT_CSUM=m
372+
CONFIG_NET_ACT_GATE=m
367373
CONFIG_DNS_RESOLVER=y
368374
CONFIG_OPENVSWITCH=m
369375
CONFIG_VSOCKETS=m
@@ -374,6 +380,7 @@ CONFIG_BPF_JIT=y
374380
CONFIG_NET_PKTGEN=m
375381
# CONFIG_NET_DROP_MONITOR is not set
376382
CONFIG_PCI=y
383+
# CONFIG_PCIEASPM is not set
377384
CONFIG_PCI_DEBUG=y
378385
CONFIG_HOTPLUG_PCI=y
379386
CONFIG_HOTPLUG_PCI_S390=y
@@ -435,6 +442,7 @@ CONFIG_DM_ZERO=m
435442
CONFIG_DM_MULTIPATH=m
436443
CONFIG_DM_MULTIPATH_QL=m
437444
CONFIG_DM_MULTIPATH_ST=m
445+
CONFIG_DM_MULTIPATH_HST=m
438446
CONFIG_DM_DELAY=m
439447
CONFIG_DM_UEVENT=y
440448
CONFIG_DM_FLAKEY=m
@@ -448,6 +456,8 @@ CONFIG_EQUALIZER=m
448456
CONFIG_IFB=m
449457
CONFIG_MACVLAN=m
450458
CONFIG_MACVTAP=m
459+
CONFIG_VXLAN=m
460+
CONFIG_BAREUDP=m
451461
CONFIG_TUN=m
452462
CONFIG_VETH=m
453463
CONFIG_VIRTIO_NET=m
@@ -481,7 +491,6 @@ CONFIG_NLMON=m
481491
CONFIG_MLX4_EN=m
482492
CONFIG_MLX5_CORE=m
483493
CONFIG_MLX5_CORE_EN=y
484-
# CONFIG_MLXFW is not set
485494
# CONFIG_NET_VENDOR_MICREL is not set
486495
# CONFIG_NET_VENDOR_MICROCHIP is not set
487496
# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -514,6 +523,7 @@ CONFIG_MLX5_CORE_EN=y
514523
# CONFIG_NET_VENDOR_TI is not set
515524
# CONFIG_NET_VENDOR_VIA is not set
516525
# CONFIG_NET_VENDOR_WIZNET is not set
526+
# CONFIG_NET_VENDOR_XILINX is not set
517527
CONFIG_PPP=m
518528
CONFIG_PPP_BSDCOMP=m
519529
CONFIG_PPP_DEFLATE=m
@@ -561,6 +571,8 @@ CONFIG_VFIO_MDEV_DEVICE=m
561571
CONFIG_VIRTIO_PCI=m
562572
CONFIG_VIRTIO_BALLOON=m
563573
CONFIG_VIRTIO_INPUT=y
574+
CONFIG_VHOST_NET=m
575+
CONFIG_VHOST_VSOCK=m
564576
CONFIG_S390_CCW_IOMMU=y
565577
CONFIG_S390_AP_IOMMU=y
566578
CONFIG_EXT4_FS=y
@@ -608,6 +620,7 @@ CONFIG_ZISOFS=y
608620
CONFIG_UDF_FS=m
609621
CONFIG_MSDOS_FS=m
610622
CONFIG_VFAT_FS=m
623+
CONFIG_EXFAT_FS=m
611624
CONFIG_NTFS_FS=m
612625
CONFIG_NTFS_RW=y
613626
CONFIG_PROC_KCORE=y
@@ -650,8 +663,8 @@ CONFIG_NLS_UTF8=m
650663
CONFIG_DLM=m
651664
CONFIG_UNICODE=y
652665
CONFIG_PERSISTENT_KEYRINGS=y
653-
CONFIG_BIG_KEYS=y
654666
CONFIG_ENCRYPTED_KEYS=m
667+
CONFIG_KEY_NOTIFICATIONS=y
655668
CONFIG_SECURITY=y
656669
CONFIG_SECURITY_NETWORK=y
657670
CONFIG_FORTIFY_SOURCE=y
@@ -675,8 +688,11 @@ CONFIG_CRYPTO_TEST=m
675688
CONFIG_CRYPTO_DH=m
676689
CONFIG_CRYPTO_ECDH=m
677690
CONFIG_CRYPTO_ECRDSA=m
691+
CONFIG_CRYPTO_CURVE25519=m
692+
CONFIG_CRYPTO_GCM=y
678693
CONFIG_CRYPTO_CHACHA20POLY1305=m
679694
CONFIG_CRYPTO_AEGIS128=m
695+
CONFIG_CRYPTO_SEQIV=y
680696
CONFIG_CRYPTO_CFB=m
681697
CONFIG_CRYPTO_LRW=m
682698
CONFIG_CRYPTO_PCBC=m
@@ -685,6 +701,7 @@ CONFIG_CRYPTO_ADIANTUM=m
685701
CONFIG_CRYPTO_XCBC=m
686702
CONFIG_CRYPTO_VMAC=m
687703
CONFIG_CRYPTO_CRC32=m
704+
CONFIG_CRYPTO_BLAKE2S=m
688705
CONFIG_CRYPTO_MICHAEL_MIC=m
689706
CONFIG_CRYPTO_RMD128=m
690707
CONFIG_CRYPTO_RMD160=m
@@ -701,6 +718,7 @@ CONFIG_CRYPTO_BLOWFISH=m
701718
CONFIG_CRYPTO_CAMELLIA=m
702719
CONFIG_CRYPTO_CAST5=m
703720
CONFIG_CRYPTO_CAST6=m
721+
CONFIG_CRYPTO_DES=m
704722
CONFIG_CRYPTO_FCRYPT=m
705723
CONFIG_CRYPTO_KHAZAD=m
706724
CONFIG_CRYPTO_SALSA20=m
@@ -719,6 +737,9 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
719737
CONFIG_CRYPTO_USER_API_RNG=m
720738
CONFIG_CRYPTO_USER_API_AEAD=m
721739
CONFIG_CRYPTO_STATS=y
740+
CONFIG_CRYPTO_LIB_BLAKE2S=m
741+
CONFIG_CRYPTO_LIB_CURVE25519=m
742+
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
722743
CONFIG_ZCRYPT=m
723744
CONFIG_PKEY=m
724745
CONFIG_CRYPTO_PAES_S390=m
@@ -774,6 +795,7 @@ CONFIG_DEBUG_SHIRQ=y
774795
CONFIG_PANIC_ON_OOPS=y
775796
CONFIG_DETECT_HUNG_TASK=y
776797
CONFIG_WQ_WATCHDOG=y
798+
CONFIG_TEST_LOCKUP=m
777799
CONFIG_DEBUG_TIMEKEEPING=y
778800
CONFIG_PROVE_LOCKING=y
779801
CONFIG_LOCK_STAT=y
@@ -786,7 +808,9 @@ CONFIG_BUG_ON_DATA_CORRUPTION=y
786808
CONFIG_DEBUG_CREDENTIALS=y
787809
CONFIG_RCU_TORTURE_TEST=m
788810
CONFIG_RCU_CPU_STALL_TIMEOUT=300
811+
# CONFIG_RCU_TRACE is not set
789812
CONFIG_LATENCYTOP=y
813+
CONFIG_BOOTTIME_TRACING=y
790814
CONFIG_FUNCTION_PROFILER=y
791815
CONFIG_STACK_TRACER=y
792816
CONFIG_IRQSOFF_TRACER=y
@@ -808,10 +832,12 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
808832
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
809833
CONFIG_LKDTM=m
810834
CONFIG_TEST_LIST_SORT=y
835+
CONFIG_TEST_MIN_HEAP=y
811836
CONFIG_TEST_SORT=y
812837
CONFIG_KPROBES_SANITY_TEST=y
813838
CONFIG_RBTREE_TEST=y
814839
CONFIG_INTERVAL_TREE_TEST=m
815840
CONFIG_PERCPU_TEST=m
816841
CONFIG_ATOMIC64_SELFTEST=y
842+
CONFIG_TEST_BITOPS=m
817843
CONFIG_TEST_BPF=m

0 commit comments

Comments
 (0)