Skip to content

Commit 0cde560

Browse files
hcahcahcahca
committed
s390: update defconfigs
Signed-off-by: Heiko Carstens <[email protected]>
1 parent 7d24464 commit 0cde560

File tree

3 files changed

+34
-17
lines changed

3 files changed

+34
-17
lines changed

‎arch/s390/configs/debug_defconfig

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ CONFIG_WATCH_QUEUE=y
55
CONFIG_AUDIT=y
66
CONFIG_NO_HZ_IDLE=y
77
CONFIG_HIGH_RES_TIMERS=y
8+
CONFIG_BPF_SYSCALL=y
9+
CONFIG_BPF_JIT=y
10+
CONFIG_BPF_JIT_ALWAYS_ON=y
11+
CONFIG_BPF_LSM=y
812
CONFIG_PREEMPT=y
13+
CONFIG_SCHED_CORE=y
914
CONFIG_BSD_PROCESS_ACCT=y
1015
CONFIG_BSD_PROCESS_ACCT_V3=y
1116
CONFIG_TASKSTATS=y
@@ -28,14 +33,13 @@ CONFIG_CGROUP_DEVICE=y
2833
CONFIG_CGROUP_CPUACCT=y
2934
CONFIG_CGROUP_PERF=y
3035
CONFIG_CGROUP_BPF=y
36+
CONFIG_CGROUP_MISC=y
3137
CONFIG_NAMESPACES=y
3238
CONFIG_USER_NS=y
3339
CONFIG_CHECKPOINT_RESTORE=y
3440
CONFIG_SCHED_AUTOGROUP=y
3541
CONFIG_EXPERT=y
3642
# CONFIG_SYSFS_SYSCALL is not set
37-
CONFIG_BPF_LSM=y
38-
CONFIG_BPF_SYSCALL=y
3943
CONFIG_USERFAULTFD=y
4044
# CONFIG_COMPAT_BRK is not set
4145
CONFIG_PROFILING=y
@@ -76,6 +80,7 @@ CONFIG_BLK_DEV_THROTTLING=y
7680
CONFIG_BLK_WBT=y
7781
CONFIG_BLK_CGROUP_IOLATENCY=y
7882
CONFIG_BLK_CGROUP_IOCOST=y
83+
CONFIG_BLK_CGROUP_IOPRIO=y
7984
CONFIG_BLK_INLINE_ENCRYPTION=y
8085
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
8186
CONFIG_PARTITION_ADVANCED=y
@@ -95,6 +100,7 @@ CONFIG_CLEANCACHE=y
95100
CONFIG_FRONTSWAP=y
96101
CONFIG_CMA_DEBUG=y
97102
CONFIG_CMA_DEBUGFS=y
103+
CONFIG_CMA_SYSFS=y
98104
CONFIG_CMA_AREAS=7
99105
CONFIG_MEM_SOFT_DIRTY=y
100106
CONFIG_ZSWAP=y
@@ -158,6 +164,7 @@ CONFIG_IPV6_RPL_LWTUNNEL=y
158164
CONFIG_MPTCP=y
159165
CONFIG_NETFILTER=y
160166
CONFIG_BRIDGE_NETFILTER=m
167+
CONFIG_NETFILTER_NETLINK_HOOK=m
161168
CONFIG_NF_CONNTRACK=m
162169
CONFIG_NF_CONNTRACK_SECMARK=y
163170
CONFIG_NF_CONNTRACK_EVENTS=y
@@ -280,6 +287,7 @@ CONFIG_IP_VS_FTP=m
280287
CONFIG_IP_VS_PE_SIP=m
281288
CONFIG_NFT_FIB_IPV4=m
282289
CONFIG_NF_TABLES_ARP=y
290+
CONFIG_NF_LOG_IPV4=m
283291
CONFIG_IP_NF_IPTABLES=m
284292
CONFIG_IP_NF_MATCH_AH=m
285293
CONFIG_IP_NF_MATCH_ECN=m
@@ -384,12 +392,11 @@ CONFIG_VSOCKETS=m
384392
CONFIG_VIRTIO_VSOCKETS=m
385393
CONFIG_NETLINK_DIAG=m
386394
CONFIG_CGROUP_NET_PRIO=y
387-
CONFIG_BPF_JIT=y
388395
CONFIG_NET_PKTGEN=m
389396
CONFIG_PCI=y
390-
CONFIG_PCI_IOV=y
391397
# CONFIG_PCIEASPM is not set
392398
CONFIG_PCI_DEBUG=y
399+
CONFIG_PCI_IOV=y
393400
CONFIG_HOTPLUG_PCI=y
394401
CONFIG_HOTPLUG_PCI_S390=y
395402
CONFIG_DEVTMPFS=y
@@ -496,6 +503,7 @@ CONFIG_NLMON=m
496503
# CONFIG_NET_VENDOR_GOOGLE is not set
497504
# CONFIG_NET_VENDOR_HUAWEI is not set
498505
# CONFIG_NET_VENDOR_INTEL is not set
506+
# CONFIG_NET_VENDOR_MICROSOFT is not set
499507
# CONFIG_NET_VENDOR_MARVELL is not set
500508
CONFIG_MLX4_EN=m
501509
CONFIG_MLX5_CORE=m
@@ -552,7 +560,6 @@ CONFIG_INPUT_EVDEV=y
552560
CONFIG_LEGACY_PTY_COUNT=0
553561
CONFIG_VIRTIO_CONSOLE=m
554562
CONFIG_HW_RANDOM_VIRTIO=m
555-
CONFIG_RAW_DRIVER=m
556563
CONFIG_HANGCHECK_TIMER=m
557564
CONFIG_TN3270_FS=y
558565
CONFIG_PPS=m
@@ -575,7 +582,6 @@ CONFIG_SYNC_FILE=y
575582
CONFIG_VFIO=m
576583
CONFIG_VFIO_PCI=m
577584
CONFIG_VFIO_MDEV=m
578-
CONFIG_VFIO_MDEV_DEVICE=m
579585
CONFIG_VIRTIO_PCI=m
580586
CONFIG_VIRTIO_BALLOON=m
581587
CONFIG_VIRTIO_INPUT=y
@@ -620,6 +626,7 @@ CONFIG_FUSE_FS=y
620626
CONFIG_CUSE=m
621627
CONFIG_VIRTIO_FS=m
622628
CONFIG_OVERLAY_FS=m
629+
CONFIG_NETFS_STATS=y
623630
CONFIG_FSCACHE=m
624631
CONFIG_CACHEFILES=m
625632
CONFIG_ISO9660_FS=y
@@ -655,7 +662,6 @@ CONFIG_NFSD_V3_ACL=y
655662
CONFIG_NFSD_V4=y
656663
CONFIG_NFSD_V4_SECURITY_LABEL=y
657664
CONFIG_CIFS=m
658-
CONFIG_CIFS_STATS2=y
659665
CONFIG_CIFS_WEAK_PW_HASH=y
660666
CONFIG_CIFS_UPCALL=y
661667
CONFIG_CIFS_XATTR=y
@@ -683,6 +689,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
683689
CONFIG_SECURITY_SELINUX_DISABLE=y
684690
CONFIG_SECURITY_LOCKDOWN_LSM=y
685691
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
692+
CONFIG_SECURITY_LANDLOCK=y
686693
CONFIG_INTEGRITY_SIGNATURE=y
687694
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
688695
CONFIG_IMA=y
@@ -697,6 +704,7 @@ CONFIG_CRYPTO_CRYPTD=m
697704
CONFIG_CRYPTO_TEST=m
698705
CONFIG_CRYPTO_DH=m
699706
CONFIG_CRYPTO_ECDH=m
707+
CONFIG_CRYPTO_ECDSA=m
700708
CONFIG_CRYPTO_ECRDSA=m
701709
CONFIG_CRYPTO_SM2=m
702710
CONFIG_CRYPTO_CURVE25519=m
@@ -844,7 +852,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
844852
CONFIG_FAIL_FUNCTION=y
845853
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
846854
CONFIG_LKDTM=m
847-
CONFIG_TEST_LIST_SORT=y
848855
CONFIG_TEST_MIN_HEAP=y
849856
CONFIG_TEST_SORT=y
850857
CONFIG_KPROBES_SANITY_TEST=y
@@ -854,3 +861,4 @@ CONFIG_PERCPU_TEST=m
854861
CONFIG_ATOMIC64_SELFTEST=y
855862
CONFIG_TEST_BITOPS=m
856863
CONFIG_TEST_BPF=m
864+
CONFIG_TEST_LIVEPATCH=m

‎arch/s390/configs/defconfig

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ CONFIG_WATCH_QUEUE=y
44
CONFIG_AUDIT=y
55
CONFIG_NO_HZ_IDLE=y
66
CONFIG_HIGH_RES_TIMERS=y
7+
CONFIG_BPF_SYSCALL=y
8+
CONFIG_BPF_JIT=y
9+
CONFIG_BPF_JIT_ALWAYS_ON=y
10+
CONFIG_BPF_LSM=y
11+
CONFIG_SCHED_CORE=y
712
CONFIG_BSD_PROCESS_ACCT=y
813
CONFIG_BSD_PROCESS_ACCT_V3=y
914
CONFIG_TASKSTATS=y
@@ -26,14 +31,13 @@ CONFIG_CGROUP_DEVICE=y
2631
CONFIG_CGROUP_CPUACCT=y
2732
CONFIG_CGROUP_PERF=y
2833
CONFIG_CGROUP_BPF=y
34+
CONFIG_CGROUP_MISC=y
2935
CONFIG_NAMESPACES=y
3036
CONFIG_USER_NS=y
3137
CONFIG_CHECKPOINT_RESTORE=y
3238
CONFIG_SCHED_AUTOGROUP=y
3339
CONFIG_EXPERT=y
3440
# CONFIG_SYSFS_SYSCALL is not set
35-
CONFIG_BPF_LSM=y
36-
CONFIG_BPF_SYSCALL=y
3741
CONFIG_USERFAULTFD=y
3842
# CONFIG_COMPAT_BRK is not set
3943
CONFIG_PROFILING=y
@@ -70,6 +74,7 @@ CONFIG_BLK_DEV_THROTTLING=y
7074
CONFIG_BLK_WBT=y
7175
CONFIG_BLK_CGROUP_IOLATENCY=y
7276
CONFIG_BLK_CGROUP_IOCOST=y
77+
CONFIG_BLK_CGROUP_IOPRIO=y
7378
CONFIG_BLK_INLINE_ENCRYPTION=y
7479
CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
7580
CONFIG_PARTITION_ADVANCED=y
@@ -87,6 +92,7 @@ CONFIG_KSM=y
8792
CONFIG_TRANSPARENT_HUGEPAGE=y
8893
CONFIG_CLEANCACHE=y
8994
CONFIG_FRONTSWAP=y
95+
CONFIG_CMA_SYSFS=y
9096
CONFIG_CMA_AREAS=7
9197
CONFIG_MEM_SOFT_DIRTY=y
9298
CONFIG_ZSWAP=y
@@ -149,6 +155,7 @@ CONFIG_IPV6_RPL_LWTUNNEL=y
149155
CONFIG_MPTCP=y
150156
CONFIG_NETFILTER=y
151157
CONFIG_BRIDGE_NETFILTER=m
158+
CONFIG_NETFILTER_NETLINK_HOOK=m
152159
CONFIG_NF_CONNTRACK=m
153160
CONFIG_NF_CONNTRACK_SECMARK=y
154161
CONFIG_NF_CONNTRACK_EVENTS=y
@@ -271,6 +278,7 @@ CONFIG_IP_VS_FTP=m
271278
CONFIG_IP_VS_PE_SIP=m
272279
CONFIG_NFT_FIB_IPV4=m
273280
CONFIG_NF_TABLES_ARP=y
281+
CONFIG_NF_LOG_IPV4=m
274282
CONFIG_IP_NF_IPTABLES=m
275283
CONFIG_IP_NF_MATCH_AH=m
276284
CONFIG_IP_NF_MATCH_ECN=m
@@ -374,11 +382,10 @@ CONFIG_VSOCKETS=m
374382
CONFIG_VIRTIO_VSOCKETS=m
375383
CONFIG_NETLINK_DIAG=m
376384
CONFIG_CGROUP_NET_PRIO=y
377-
CONFIG_BPF_JIT=y
378385
CONFIG_NET_PKTGEN=m
379386
CONFIG_PCI=y
380-
CONFIG_PCI_IOV=y
381387
# CONFIG_PCIEASPM is not set
388+
CONFIG_PCI_IOV=y
382389
CONFIG_HOTPLUG_PCI=y
383390
CONFIG_HOTPLUG_PCI_S390=y
384391
CONFIG_UEVENT_HELPER=y
@@ -488,6 +495,7 @@ CONFIG_NLMON=m
488495
# CONFIG_NET_VENDOR_GOOGLE is not set
489496
# CONFIG_NET_VENDOR_HUAWEI is not set
490497
# CONFIG_NET_VENDOR_INTEL is not set
498+
# CONFIG_NET_VENDOR_MICROSOFT is not set
491499
# CONFIG_NET_VENDOR_MARVELL is not set
492500
CONFIG_MLX4_EN=m
493501
CONFIG_MLX5_CORE=m
@@ -544,7 +552,6 @@ CONFIG_INPUT_EVDEV=y
544552
CONFIG_LEGACY_PTY_COUNT=0
545553
CONFIG_VIRTIO_CONSOLE=m
546554
CONFIG_HW_RANDOM_VIRTIO=m
547-
CONFIG_RAW_DRIVER=m
548555
CONFIG_HANGCHECK_TIMER=m
549556
CONFIG_TN3270_FS=y
550557
# CONFIG_PTP_1588_CLOCK is not set
@@ -567,7 +574,6 @@ CONFIG_SYNC_FILE=y
567574
CONFIG_VFIO=m
568575
CONFIG_VFIO_PCI=m
569576
CONFIG_VFIO_MDEV=m
570-
CONFIG_VFIO_MDEV_DEVICE=m
571577
CONFIG_VIRTIO_PCI=m
572578
CONFIG_VIRTIO_BALLOON=m
573579
CONFIG_VIRTIO_INPUT=y
@@ -608,6 +614,7 @@ CONFIG_FUSE_FS=y
608614
CONFIG_CUSE=m
609615
CONFIG_VIRTIO_FS=m
610616
CONFIG_OVERLAY_FS=m
617+
CONFIG_NETFS_STATS=y
611618
CONFIG_FSCACHE=m
612619
CONFIG_CACHEFILES=m
613620
CONFIG_ISO9660_FS=y
@@ -643,7 +650,6 @@ CONFIG_NFSD_V3_ACL=y
643650
CONFIG_NFSD_V4=y
644651
CONFIG_NFSD_V4_SECURITY_LABEL=y
645652
CONFIG_CIFS=m
646-
CONFIG_CIFS_STATS2=y
647653
CONFIG_CIFS_WEAK_PW_HASH=y
648654
CONFIG_CIFS_UPCALL=y
649655
CONFIG_CIFS_XATTR=y
@@ -670,6 +676,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
670676
CONFIG_SECURITY_SELINUX_DISABLE=y
671677
CONFIG_SECURITY_LOCKDOWN_LSM=y
672678
CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
679+
CONFIG_SECURITY_LANDLOCK=y
673680
CONFIG_INTEGRITY_SIGNATURE=y
674681
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
675682
CONFIG_IMA=y
@@ -685,6 +692,7 @@ CONFIG_CRYPTO_CRYPTD=m
685692
CONFIG_CRYPTO_TEST=m
686693
CONFIG_CRYPTO_DH=m
687694
CONFIG_CRYPTO_ECDH=m
695+
CONFIG_CRYPTO_ECDSA=m
688696
CONFIG_CRYPTO_ECRDSA=m
689697
CONFIG_CRYPTO_SM2=m
690698
CONFIG_CRYPTO_CURVE25519=m
@@ -755,6 +763,7 @@ CONFIG_CRC8=m
755763
CONFIG_DMA_CMA=y
756764
CONFIG_CMA_SIZE_MBYTES=0
757765
CONFIG_PRINTK_TIME=y
766+
CONFIG_DYNAMIC_DEBUG=y
758767
CONFIG_DEBUG_INFO=y
759768
CONFIG_DEBUG_INFO_DWARF4=y
760769
CONFIG_GDB_SCRIPTS=y
@@ -782,3 +791,4 @@ CONFIG_LKDTM=m
782791
CONFIG_PERCPU_TEST=m
783792
CONFIG_ATOMIC64_SELFTEST=y
784793
CONFIG_TEST_BPF=m
794+
CONFIG_TEST_LIVEPATCH=m

‎arch/s390/configs/zfcpdump_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ CONFIG_PARTITION_ADVANCED=y
2929
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
3030
# CONFIG_COMPACTION is not set
3131
# CONFIG_MIGRATION is not set
32-
# CONFIG_BOUNCE is not set
3332
CONFIG_NET=y
3433
# CONFIG_IUCV is not set
34+
# CONFIG_PCPU_DEV_REFCNT is not set
3535
# CONFIG_ETHTOOL_NETLINK is not set
3636
CONFIG_DEVTMPFS=y
3737
CONFIG_BLK_DEV_RAM=y
@@ -51,7 +51,6 @@ CONFIG_ZFCP=y
5151
# CONFIG_SERIO is not set
5252
# CONFIG_HVC_IUCV is not set
5353
# CONFIG_HW_RANDOM_S390 is not set
54-
CONFIG_RAW_DRIVER=y
5554
# CONFIG_HMC_DRV is not set
5655
# CONFIG_S390_TAPE is not set
5756
# CONFIG_VMCP is not set

0 commit comments

Comments
 (0)