Skip to content

Commit de20111

Browse files
author
Martin Schwidefsky
committed
s390: update defconfig
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
1 parent 451239e commit de20111

File tree

3 files changed

+46
-18
lines changed

3 files changed

+46
-18
lines changed

‎arch/s390/configs/default_defconfig

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ CONFIG_CPUSETS=y
2424
CONFIG_CGROUP_DEVICE=y
2525
CONFIG_CGROUP_CPUACCT=y
2626
CONFIG_CGROUP_PERF=y
27-
CONFIG_CHECKPOINT_RESTORE=y
2827
CONFIG_NAMESPACES=y
2928
CONFIG_USER_NS=y
3029
CONFIG_SCHED_AUTOGROUP=y
3130
CONFIG_BLK_DEV_INITRD=y
3231
CONFIG_EXPERT=y
3332
# CONFIG_SYSFS_SYSCALL is not set
33+
CONFIG_CHECKPOINT_RESTORE=y
3434
CONFIG_BPF_SYSCALL=y
3535
CONFIG_USERFAULTFD=y
3636
# CONFIG_COMPAT_BRK is not set
@@ -59,10 +59,11 @@ CONFIG_CFQ_GROUP_IOSCHED=y
5959
CONFIG_DEFAULT_DEADLINE=y
6060
CONFIG_LIVEPATCH=y
6161
CONFIG_TUNE_ZEC12=y
62-
CONFIG_NR_CPUS=256
62+
CONFIG_NR_CPUS=512
6363
CONFIG_NUMA=y
6464
CONFIG_PREEMPT=y
6565
CONFIG_HZ_100=y
66+
CONFIG_KEXEC_FILE=y
6667
CONFIG_MEMORY_HOTPLUG=y
6768
CONFIG_MEMORY_HOTREMOVE=y
6869
CONFIG_KSM=y
@@ -305,7 +306,6 @@ CONFIG_IP6_NF_SECURITY=m
305306
CONFIG_IP6_NF_NAT=m
306307
CONFIG_IP6_NF_TARGET_MASQUERADE=m
307308
CONFIG_NF_TABLES_BRIDGE=m
308-
CONFIG_NET_SCTPPROBE=m
309309
CONFIG_RDS=m
310310
CONFIG_RDS_RDMA=m
311311
CONFIG_RDS_TCP=m
@@ -364,11 +364,11 @@ CONFIG_NET_ACT_SIMP=m
364364
CONFIG_NET_ACT_SKBEDIT=m
365365
CONFIG_NET_ACT_CSUM=m
366366
CONFIG_DNS_RESOLVER=y
367+
CONFIG_OPENVSWITCH=m
367368
CONFIG_NETLINK_DIAG=m
368369
CONFIG_CGROUP_NET_PRIO=y
369370
CONFIG_BPF_JIT=y
370371
CONFIG_NET_PKTGEN=m
371-
CONFIG_NET_TCPPROBE=m
372372
CONFIG_DEVTMPFS=y
373373
CONFIG_DMA_CMA=y
374374
CONFIG_CMA_SIZE_MBYTES=0
@@ -380,9 +380,9 @@ CONFIG_BLK_DEV_DRBD=m
380380
CONFIG_BLK_DEV_NBD=m
381381
CONFIG_BLK_DEV_RAM=y
382382
CONFIG_BLK_DEV_RAM_SIZE=32768
383-
CONFIG_BLK_DEV_RAM_DAX=y
384383
CONFIG_VIRTIO_BLK=y
385384
CONFIG_BLK_DEV_RBD=m
385+
CONFIG_BLK_DEV_NVME=m
386386
CONFIG_ENCLOSURE_SERVICES=m
387387
CONFIG_GENWQE=m
388388
CONFIG_RAID_ATTRS=m
@@ -461,6 +461,7 @@ CONFIG_PPTP=m
461461
CONFIG_PPPOL2TP=m
462462
CONFIG_PPP_ASYNC=m
463463
CONFIG_PPP_SYNC_TTY=m
464+
CONFIG_INPUT_EVDEV=y
464465
# CONFIG_INPUT_KEYBOARD is not set
465466
# CONFIG_INPUT_MOUSE is not set
466467
# CONFIG_SERIO is not set
@@ -474,6 +475,9 @@ CONFIG_WATCHDOG=y
474475
CONFIG_WATCHDOG_NOWAYOUT=y
475476
CONFIG_SOFT_WATCHDOG=m
476477
CONFIG_DIAG288_WATCHDOG=m
478+
CONFIG_DRM=y
479+
CONFIG_DRM_VIRTIO_GPU=y
480+
CONFIG_FRAMEBUFFER_CONSOLE=y
477481
# CONFIG_HID is not set
478482
# CONFIG_USB_SUPPORT is not set
479483
CONFIG_INFINIBAND=m
@@ -482,7 +486,9 @@ CONFIG_MLX4_INFINIBAND=m
482486
CONFIG_MLX5_INFINIBAND=m
483487
CONFIG_VFIO=m
484488
CONFIG_VFIO_PCI=m
489+
CONFIG_VIRTIO_PCI=m
485490
CONFIG_VIRTIO_BALLOON=m
491+
CONFIG_VIRTIO_INPUT=y
486492
CONFIG_EXT4_FS=y
487493
CONFIG_EXT4_FS_POSIX_ACL=y
488494
CONFIG_EXT4_FS_SECURITY=y
@@ -641,6 +647,8 @@ CONFIG_ATOMIC64_SELFTEST=y
641647
CONFIG_TEST_BPF=m
642648
CONFIG_BUG_ON_DATA_CORRUPTION=y
643649
CONFIG_S390_PTDUMP=y
650+
CONFIG_PERSISTENT_KEYRINGS=y
651+
CONFIG_BIG_KEYS=y
644652
CONFIG_ENCRYPTED_KEYS=m
645653
CONFIG_SECURITY=y
646654
CONFIG_SECURITY_NETWORK=y
@@ -649,17 +657,20 @@ CONFIG_SECURITY_SELINUX=y
649657
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
650658
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
651659
CONFIG_SECURITY_SELINUX_DISABLE=y
660+
CONFIG_INTEGRITY_SIGNATURE=y
661+
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
652662
CONFIG_IMA=y
663+
CONFIG_IMA_DEFAULT_HASH_SHA256=y
664+
CONFIG_IMA_WRITE_POLICY=y
653665
CONFIG_IMA_APPRAISE=y
654-
CONFIG_CRYPTO_RSA=m
655666
CONFIG_CRYPTO_DH=m
656667
CONFIG_CRYPTO_ECDH=m
657668
CONFIG_CRYPTO_USER=m
669+
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
658670
CONFIG_CRYPTO_PCRYPT=m
659671
CONFIG_CRYPTO_CRYPTD=m
660672
CONFIG_CRYPTO_MCRYPTD=m
661673
CONFIG_CRYPTO_TEST=m
662-
CONFIG_CRYPTO_GCM=m
663674
CONFIG_CRYPTO_CHACHA20POLY1305=m
664675
CONFIG_CRYPTO_LRW=m
665676
CONFIG_CRYPTO_PCBC=m
@@ -707,9 +718,8 @@ CONFIG_CRYPTO_DES_S390=m
707718
CONFIG_CRYPTO_AES_S390=m
708719
CONFIG_CRYPTO_GHASH_S390=m
709720
CONFIG_CRYPTO_CRC32_S390=y
710-
CONFIG_ASYMMETRIC_KEY_TYPE=y
711-
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
712-
CONFIG_X509_CERTIFICATE_PARSER=m
721+
CONFIG_PKCS7_MESSAGE_PARSER=y
722+
CONFIG_SYSTEM_TRUSTED_KEYRING=y
713723
CONFIG_CRC7=m
714724
CONFIG_CRC8=m
715725
CONFIG_RANDOM32_SELFTEST=y
@@ -719,4 +729,3 @@ CONFIG_APPLDATA_BASE=y
719729
CONFIG_KVM=m
720730
CONFIG_KVM_S390_UCONTROL=y
721731
CONFIG_VHOST_NET=m
722-
CONFIG_KEXEC_FILE=y

‎arch/s390/configs/performance_defconfig

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ CONFIG_CPUSETS=y
2525
CONFIG_CGROUP_DEVICE=y
2626
CONFIG_CGROUP_CPUACCT=y
2727
CONFIG_CGROUP_PERF=y
28-
CONFIG_CHECKPOINT_RESTORE=y
2928
CONFIG_NAMESPACES=y
3029
CONFIG_USER_NS=y
3130
CONFIG_SCHED_AUTOGROUP=y
3231
CONFIG_BLK_DEV_INITRD=y
3332
CONFIG_EXPERT=y
3433
# CONFIG_SYSFS_SYSCALL is not set
34+
CONFIG_CHECKPOINT_RESTORE=y
3535
CONFIG_BPF_SYSCALL=y
3636
CONFIG_USERFAULTFD=y
3737
# CONFIG_COMPAT_BRK is not set
@@ -45,6 +45,8 @@ CONFIG_MODULE_UNLOAD=y
4545
CONFIG_MODULE_FORCE_UNLOAD=y
4646
CONFIG_MODVERSIONS=y
4747
CONFIG_MODULE_SRCVERSION_ALL=y
48+
CONFIG_MODULE_SIG=y
49+
CONFIG_MODULE_SIG_SHA256=y
4850
CONFIG_BLK_DEV_INTEGRITY=y
4951
CONFIG_BLK_DEV_THROTTLING=y
5052
CONFIG_BLK_WBT=y
@@ -62,6 +64,7 @@ CONFIG_TUNE_ZEC12=y
6264
CONFIG_NR_CPUS=512
6365
CONFIG_NUMA=y
6466
CONFIG_HZ_100=y
67+
CONFIG_KEXEC_FILE=y
6568
CONFIG_MEMORY_HOTPLUG=y
6669
CONFIG_MEMORY_HOTREMOVE=y
6770
CONFIG_KSM=y
@@ -301,7 +304,6 @@ CONFIG_IP6_NF_SECURITY=m
301304
CONFIG_IP6_NF_NAT=m
302305
CONFIG_IP6_NF_TARGET_MASQUERADE=m
303306
CONFIG_NF_TABLES_BRIDGE=m
304-
CONFIG_NET_SCTPPROBE=m
305307
CONFIG_RDS=m
306308
CONFIG_RDS_RDMA=m
307309
CONFIG_RDS_TCP=m
@@ -359,11 +361,11 @@ CONFIG_NET_ACT_SIMP=m
359361
CONFIG_NET_ACT_SKBEDIT=m
360362
CONFIG_NET_ACT_CSUM=m
361363
CONFIG_DNS_RESOLVER=y
364+
CONFIG_OPENVSWITCH=m
362365
CONFIG_NETLINK_DIAG=m
363366
CONFIG_CGROUP_NET_PRIO=y
364367
CONFIG_BPF_JIT=y
365368
CONFIG_NET_PKTGEN=m
366-
CONFIG_NET_TCPPROBE=m
367369
CONFIG_DEVTMPFS=y
368370
CONFIG_DMA_CMA=y
369371
CONFIG_CMA_SIZE_MBYTES=0
@@ -375,8 +377,9 @@ CONFIG_BLK_DEV_DRBD=m
375377
CONFIG_BLK_DEV_NBD=m
376378
CONFIG_BLK_DEV_RAM=y
377379
CONFIG_BLK_DEV_RAM_SIZE=32768
378-
CONFIG_BLK_DEV_RAM_DAX=y
379380
CONFIG_VIRTIO_BLK=y
381+
CONFIG_BLK_DEV_RBD=m
382+
CONFIG_BLK_DEV_NVME=m
380383
CONFIG_ENCLOSURE_SERVICES=m
381384
CONFIG_GENWQE=m
382385
CONFIG_RAID_ATTRS=m
@@ -455,6 +458,7 @@ CONFIG_PPTP=m
455458
CONFIG_PPPOL2TP=m
456459
CONFIG_PPP_ASYNC=m
457460
CONFIG_PPP_SYNC_TTY=m
461+
CONFIG_INPUT_EVDEV=y
458462
# CONFIG_INPUT_KEYBOARD is not set
459463
# CONFIG_INPUT_MOUSE is not set
460464
# CONFIG_SERIO is not set
@@ -468,6 +472,9 @@ CONFIG_WATCHDOG=y
468472
CONFIG_WATCHDOG_NOWAYOUT=y
469473
CONFIG_SOFT_WATCHDOG=m
470474
CONFIG_DIAG288_WATCHDOG=m
475+
CONFIG_DRM=y
476+
CONFIG_DRM_VIRTIO_GPU=y
477+
CONFIG_FRAMEBUFFER_CONSOLE=y
471478
# CONFIG_HID is not set
472479
# CONFIG_USB_SUPPORT is not set
473480
CONFIG_INFINIBAND=m
@@ -476,7 +483,9 @@ CONFIG_MLX4_INFINIBAND=m
476483
CONFIG_MLX5_INFINIBAND=m
477484
CONFIG_VFIO=m
478485
CONFIG_VFIO_PCI=m
486+
CONFIG_VIRTIO_PCI=m
479487
CONFIG_VIRTIO_BALLOON=m
488+
CONFIG_VIRTIO_INPUT=y
480489
CONFIG_EXT4_FS=y
481490
CONFIG_EXT4_FS_POSIX_ACL=y
482491
CONFIG_EXT4_FS_SECURITY=y
@@ -507,7 +516,6 @@ CONFIG_AUTOFS4_FS=m
507516
CONFIG_FUSE_FS=y
508517
CONFIG_CUSE=m
509518
CONFIG_OVERLAY_FS=m
510-
CONFIG_OVERLAY_FS_REDIRECT_DIR=y
511519
CONFIG_FSCACHE=m
512520
CONFIG_CACHEFILES=m
513521
CONFIG_ISO9660_FS=y
@@ -592,8 +600,10 @@ CONFIG_SECURITY_SELINUX_DISABLE=y
592600
CONFIG_INTEGRITY_SIGNATURE=y
593601
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
594602
CONFIG_IMA=y
603+
CONFIG_IMA_DEFAULT_HASH_SHA256=y
595604
CONFIG_IMA_WRITE_POLICY=y
596605
CONFIG_IMA_APPRAISE=y
606+
CONFIG_CRYPTO_FIPS=y
597607
CONFIG_CRYPTO_DH=m
598608
CONFIG_CRYPTO_ECDH=m
599609
CONFIG_CRYPTO_USER=m

‎arch/s390/defconfig

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CONFIG_TASKSTATS=y
88
CONFIG_TASK_DELAY_ACCT=y
99
CONFIG_TASK_XACCT=y
1010
CONFIG_TASK_IO_ACCOUNTING=y
11+
# CONFIG_CPU_ISOLATION is not set
1112
CONFIG_IKCONFIG=y
1213
CONFIG_IKCONFIG_PROC=y
1314
CONFIG_CGROUPS=y
@@ -23,12 +24,12 @@ CONFIG_CPUSETS=y
2324
CONFIG_CGROUP_DEVICE=y
2425
CONFIG_CGROUP_CPUACCT=y
2526
CONFIG_CGROUP_PERF=y
26-
CONFIG_CHECKPOINT_RESTORE=y
2727
CONFIG_NAMESPACES=y
2828
CONFIG_USER_NS=y
2929
CONFIG_BLK_DEV_INITRD=y
3030
CONFIG_EXPERT=y
3131
# CONFIG_SYSFS_SYSCALL is not set
32+
CONFIG_CHECKPOINT_RESTORE=y
3233
CONFIG_BPF_SYSCALL=y
3334
CONFIG_USERFAULTFD=y
3435
# CONFIG_COMPAT_BRK is not set
@@ -47,6 +48,7 @@ CONFIG_LIVEPATCH=y
4748
CONFIG_NR_CPUS=256
4849
CONFIG_NUMA=y
4950
CONFIG_HZ_100=y
51+
CONFIG_KEXEC_FILE=y
5052
CONFIG_MEMORY_HOTPLUG=y
5153
CONFIG_MEMORY_HOTREMOVE=y
5254
CONFIG_KSM=y
@@ -129,10 +131,13 @@ CONFIG_EQUALIZER=m
129131
CONFIG_TUN=m
130132
CONFIG_VIRTIO_NET=y
131133
# CONFIG_NET_VENDOR_ALACRITECH is not set
134+
# CONFIG_NET_VENDOR_CORTINA is not set
132135
# CONFIG_NET_VENDOR_SOLARFLARE is not set
136+
# CONFIG_NET_VENDOR_SOCIONEXT is not set
133137
# CONFIG_NET_VENDOR_SYNOPSYS is not set
134138
# CONFIG_INPUT is not set
135139
# CONFIG_SERIO is not set
140+
# CONFIG_VT is not set
136141
CONFIG_DEVKMEM=y
137142
CONFIG_RAW_DRIVER=m
138143
CONFIG_VIRTIO_BALLOON=y
@@ -177,13 +182,15 @@ CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
177182
CONFIG_STACK_TRACER=y
178183
CONFIG_BLK_DEV_IO_TRACE=y
179184
CONFIG_FUNCTION_PROFILER=y
180-
CONFIG_KPROBES_SANITY_TEST=y
185+
# CONFIG_RUNTIME_TESTING_MENU is not set
181186
CONFIG_S390_PTDUMP=y
182187
CONFIG_CRYPTO_CRYPTD=m
188+
CONFIG_CRYPTO_AUTHENC=m
183189
CONFIG_CRYPTO_TEST=m
184190
CONFIG_CRYPTO_CCM=m
185191
CONFIG_CRYPTO_GCM=m
186192
CONFIG_CRYPTO_CBC=y
193+
CONFIG_CRYPTO_CFB=m
187194
CONFIG_CRYPTO_CTS=m
188195
CONFIG_CRYPTO_LRW=m
189196
CONFIG_CRYPTO_PCBC=m
@@ -213,6 +220,8 @@ CONFIG_CRYPTO_KHAZAD=m
213220
CONFIG_CRYPTO_SALSA20=m
214221
CONFIG_CRYPTO_SEED=m
215222
CONFIG_CRYPTO_SERPENT=m
223+
CONFIG_CRYPTO_SM4=m
224+
CONFIG_CRYPTO_SPECK=m
216225
CONFIG_CRYPTO_TEA=m
217226
CONFIG_CRYPTO_TWOFISH=m
218227
CONFIG_CRYPTO_DEFLATE=m

0 commit comments

Comments
 (0)