diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-11-20 02:48:02 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-04-16 04:29:34 -0400 |
commit | de2011197d15746307e709687401397fe52bea83 (patch) | |
tree | 0187fbb1cce0681e2a5c021f46e7aa08c17474bb | |
parent | 451239eb3d397bd197a79cc3aab943da41ba0905 (diff) |
s390: update defconfig
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/configs/default_defconfig | 31 | ||||
-rw-r--r-- | arch/s390/configs/performance_defconfig | 20 | ||||
-rw-r--r-- | arch/s390/defconfig | 13 |
3 files changed, 46 insertions, 18 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig index 2310315b0744..6176fe9795ca 100644 --- a/arch/s390/configs/default_defconfig +++ b/arch/s390/configs/default_defconfig | |||
@@ -24,13 +24,13 @@ CONFIG_CPUSETS=y | |||
24 | CONFIG_CGROUP_DEVICE=y | 24 | CONFIG_CGROUP_DEVICE=y |
25 | CONFIG_CGROUP_CPUACCT=y | 25 | CONFIG_CGROUP_CPUACCT=y |
26 | CONFIG_CGROUP_PERF=y | 26 | CONFIG_CGROUP_PERF=y |
27 | CONFIG_CHECKPOINT_RESTORE=y | ||
28 | CONFIG_NAMESPACES=y | 27 | CONFIG_NAMESPACES=y |
29 | CONFIG_USER_NS=y | 28 | CONFIG_USER_NS=y |
30 | CONFIG_SCHED_AUTOGROUP=y | 29 | CONFIG_SCHED_AUTOGROUP=y |
31 | CONFIG_BLK_DEV_INITRD=y | 30 | CONFIG_BLK_DEV_INITRD=y |
32 | CONFIG_EXPERT=y | 31 | CONFIG_EXPERT=y |
33 | # CONFIG_SYSFS_SYSCALL is not set | 32 | # CONFIG_SYSFS_SYSCALL is not set |
33 | CONFIG_CHECKPOINT_RESTORE=y | ||
34 | CONFIG_BPF_SYSCALL=y | 34 | CONFIG_BPF_SYSCALL=y |
35 | CONFIG_USERFAULTFD=y | 35 | CONFIG_USERFAULTFD=y |
36 | # CONFIG_COMPAT_BRK is not set | 36 | # CONFIG_COMPAT_BRK is not set |
@@ -59,10 +59,11 @@ CONFIG_CFQ_GROUP_IOSCHED=y | |||
59 | CONFIG_DEFAULT_DEADLINE=y | 59 | CONFIG_DEFAULT_DEADLINE=y |
60 | CONFIG_LIVEPATCH=y | 60 | CONFIG_LIVEPATCH=y |
61 | CONFIG_TUNE_ZEC12=y | 61 | CONFIG_TUNE_ZEC12=y |
62 | CONFIG_NR_CPUS=256 | 62 | CONFIG_NR_CPUS=512 |
63 | CONFIG_NUMA=y | 63 | CONFIG_NUMA=y |
64 | CONFIG_PREEMPT=y | 64 | CONFIG_PREEMPT=y |
65 | CONFIG_HZ_100=y | 65 | CONFIG_HZ_100=y |
66 | CONFIG_KEXEC_FILE=y | ||
66 | CONFIG_MEMORY_HOTPLUG=y | 67 | CONFIG_MEMORY_HOTPLUG=y |
67 | CONFIG_MEMORY_HOTREMOVE=y | 68 | CONFIG_MEMORY_HOTREMOVE=y |
68 | CONFIG_KSM=y | 69 | CONFIG_KSM=y |
@@ -305,7 +306,6 @@ CONFIG_IP6_NF_SECURITY=m | |||
305 | CONFIG_IP6_NF_NAT=m | 306 | CONFIG_IP6_NF_NAT=m |
306 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 307 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
307 | CONFIG_NF_TABLES_BRIDGE=m | 308 | CONFIG_NF_TABLES_BRIDGE=m |
308 | CONFIG_NET_SCTPPROBE=m | ||
309 | CONFIG_RDS=m | 309 | CONFIG_RDS=m |
310 | CONFIG_RDS_RDMA=m | 310 | CONFIG_RDS_RDMA=m |
311 | CONFIG_RDS_TCP=m | 311 | CONFIG_RDS_TCP=m |
@@ -364,11 +364,11 @@ CONFIG_NET_ACT_SIMP=m | |||
364 | CONFIG_NET_ACT_SKBEDIT=m | 364 | CONFIG_NET_ACT_SKBEDIT=m |
365 | CONFIG_NET_ACT_CSUM=m | 365 | CONFIG_NET_ACT_CSUM=m |
366 | CONFIG_DNS_RESOLVER=y | 366 | CONFIG_DNS_RESOLVER=y |
367 | CONFIG_OPENVSWITCH=m | ||
367 | CONFIG_NETLINK_DIAG=m | 368 | CONFIG_NETLINK_DIAG=m |
368 | CONFIG_CGROUP_NET_PRIO=y | 369 | CONFIG_CGROUP_NET_PRIO=y |
369 | CONFIG_BPF_JIT=y | 370 | CONFIG_BPF_JIT=y |
370 | CONFIG_NET_PKTGEN=m | 371 | CONFIG_NET_PKTGEN=m |
371 | CONFIG_NET_TCPPROBE=m | ||
372 | CONFIG_DEVTMPFS=y | 372 | CONFIG_DEVTMPFS=y |
373 | CONFIG_DMA_CMA=y | 373 | CONFIG_DMA_CMA=y |
374 | CONFIG_CMA_SIZE_MBYTES=0 | 374 | CONFIG_CMA_SIZE_MBYTES=0 |
@@ -380,9 +380,9 @@ CONFIG_BLK_DEV_DRBD=m | |||
380 | CONFIG_BLK_DEV_NBD=m | 380 | CONFIG_BLK_DEV_NBD=m |
381 | CONFIG_BLK_DEV_RAM=y | 381 | CONFIG_BLK_DEV_RAM=y |
382 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 382 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
383 | CONFIG_BLK_DEV_RAM_DAX=y | ||
384 | CONFIG_VIRTIO_BLK=y | 383 | CONFIG_VIRTIO_BLK=y |
385 | CONFIG_BLK_DEV_RBD=m | 384 | CONFIG_BLK_DEV_RBD=m |
385 | CONFIG_BLK_DEV_NVME=m | ||
386 | CONFIG_ENCLOSURE_SERVICES=m | 386 | CONFIG_ENCLOSURE_SERVICES=m |
387 | CONFIG_GENWQE=m | 387 | CONFIG_GENWQE=m |
388 | CONFIG_RAID_ATTRS=m | 388 | CONFIG_RAID_ATTRS=m |
@@ -461,6 +461,7 @@ CONFIG_PPTP=m | |||
461 | CONFIG_PPPOL2TP=m | 461 | CONFIG_PPPOL2TP=m |
462 | CONFIG_PPP_ASYNC=m | 462 | CONFIG_PPP_ASYNC=m |
463 | CONFIG_PPP_SYNC_TTY=m | 463 | CONFIG_PPP_SYNC_TTY=m |
464 | CONFIG_INPUT_EVDEV=y | ||
464 | # CONFIG_INPUT_KEYBOARD is not set | 465 | # CONFIG_INPUT_KEYBOARD is not set |
465 | # CONFIG_INPUT_MOUSE is not set | 466 | # CONFIG_INPUT_MOUSE is not set |
466 | # CONFIG_SERIO is not set | 467 | # CONFIG_SERIO is not set |
@@ -474,6 +475,9 @@ CONFIG_WATCHDOG=y | |||
474 | CONFIG_WATCHDOG_NOWAYOUT=y | 475 | CONFIG_WATCHDOG_NOWAYOUT=y |
475 | CONFIG_SOFT_WATCHDOG=m | 476 | CONFIG_SOFT_WATCHDOG=m |
476 | CONFIG_DIAG288_WATCHDOG=m | 477 | CONFIG_DIAG288_WATCHDOG=m |
478 | CONFIG_DRM=y | ||
479 | CONFIG_DRM_VIRTIO_GPU=y | ||
480 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
477 | # CONFIG_HID is not set | 481 | # CONFIG_HID is not set |
478 | # CONFIG_USB_SUPPORT is not set | 482 | # CONFIG_USB_SUPPORT is not set |
479 | CONFIG_INFINIBAND=m | 483 | CONFIG_INFINIBAND=m |
@@ -482,7 +486,9 @@ CONFIG_MLX4_INFINIBAND=m | |||
482 | CONFIG_MLX5_INFINIBAND=m | 486 | CONFIG_MLX5_INFINIBAND=m |
483 | CONFIG_VFIO=m | 487 | CONFIG_VFIO=m |
484 | CONFIG_VFIO_PCI=m | 488 | CONFIG_VFIO_PCI=m |
489 | CONFIG_VIRTIO_PCI=m | ||
485 | CONFIG_VIRTIO_BALLOON=m | 490 | CONFIG_VIRTIO_BALLOON=m |
491 | CONFIG_VIRTIO_INPUT=y | ||
486 | CONFIG_EXT4_FS=y | 492 | CONFIG_EXT4_FS=y |
487 | CONFIG_EXT4_FS_POSIX_ACL=y | 493 | CONFIG_EXT4_FS_POSIX_ACL=y |
488 | CONFIG_EXT4_FS_SECURITY=y | 494 | CONFIG_EXT4_FS_SECURITY=y |
@@ -641,6 +647,8 @@ CONFIG_ATOMIC64_SELFTEST=y | |||
641 | CONFIG_TEST_BPF=m | 647 | CONFIG_TEST_BPF=m |
642 | CONFIG_BUG_ON_DATA_CORRUPTION=y | 648 | CONFIG_BUG_ON_DATA_CORRUPTION=y |
643 | CONFIG_S390_PTDUMP=y | 649 | CONFIG_S390_PTDUMP=y |
650 | CONFIG_PERSISTENT_KEYRINGS=y | ||
651 | CONFIG_BIG_KEYS=y | ||
644 | CONFIG_ENCRYPTED_KEYS=m | 652 | CONFIG_ENCRYPTED_KEYS=m |
645 | CONFIG_SECURITY=y | 653 | CONFIG_SECURITY=y |
646 | CONFIG_SECURITY_NETWORK=y | 654 | CONFIG_SECURITY_NETWORK=y |
@@ -649,17 +657,20 @@ CONFIG_SECURITY_SELINUX=y | |||
649 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | 657 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y |
650 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 | 658 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 |
651 | CONFIG_SECURITY_SELINUX_DISABLE=y | 659 | CONFIG_SECURITY_SELINUX_DISABLE=y |
660 | CONFIG_INTEGRITY_SIGNATURE=y | ||
661 | CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y | ||
652 | CONFIG_IMA=y | 662 | CONFIG_IMA=y |
663 | CONFIG_IMA_DEFAULT_HASH_SHA256=y | ||
664 | CONFIG_IMA_WRITE_POLICY=y | ||
653 | CONFIG_IMA_APPRAISE=y | 665 | CONFIG_IMA_APPRAISE=y |
654 | CONFIG_CRYPTO_RSA=m | ||
655 | CONFIG_CRYPTO_DH=m | 666 | CONFIG_CRYPTO_DH=m |
656 | CONFIG_CRYPTO_ECDH=m | 667 | CONFIG_CRYPTO_ECDH=m |
657 | CONFIG_CRYPTO_USER=m | 668 | CONFIG_CRYPTO_USER=m |
669 | # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set | ||
658 | CONFIG_CRYPTO_PCRYPT=m | 670 | CONFIG_CRYPTO_PCRYPT=m |
659 | CONFIG_CRYPTO_CRYPTD=m | 671 | CONFIG_CRYPTO_CRYPTD=m |
660 | CONFIG_CRYPTO_MCRYPTD=m | 672 | CONFIG_CRYPTO_MCRYPTD=m |
661 | CONFIG_CRYPTO_TEST=m | 673 | CONFIG_CRYPTO_TEST=m |
662 | CONFIG_CRYPTO_GCM=m | ||
663 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 674 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
664 | CONFIG_CRYPTO_LRW=m | 675 | CONFIG_CRYPTO_LRW=m |
665 | CONFIG_CRYPTO_PCBC=m | 676 | CONFIG_CRYPTO_PCBC=m |
@@ -707,9 +718,8 @@ CONFIG_CRYPTO_DES_S390=m | |||
707 | CONFIG_CRYPTO_AES_S390=m | 718 | CONFIG_CRYPTO_AES_S390=m |
708 | CONFIG_CRYPTO_GHASH_S390=m | 719 | CONFIG_CRYPTO_GHASH_S390=m |
709 | CONFIG_CRYPTO_CRC32_S390=y | 720 | CONFIG_CRYPTO_CRC32_S390=y |
710 | CONFIG_ASYMMETRIC_KEY_TYPE=y | 721 | CONFIG_PKCS7_MESSAGE_PARSER=y |
711 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m | 722 | CONFIG_SYSTEM_TRUSTED_KEYRING=y |
712 | CONFIG_X509_CERTIFICATE_PARSER=m | ||
713 | CONFIG_CRC7=m | 723 | CONFIG_CRC7=m |
714 | CONFIG_CRC8=m | 724 | CONFIG_CRC8=m |
715 | CONFIG_RANDOM32_SELFTEST=y | 725 | CONFIG_RANDOM32_SELFTEST=y |
@@ -719,4 +729,3 @@ CONFIG_APPLDATA_BASE=y | |||
719 | CONFIG_KVM=m | 729 | CONFIG_KVM=m |
720 | CONFIG_KVM_S390_UCONTROL=y | 730 | CONFIG_KVM_S390_UCONTROL=y |
721 | CONFIG_VHOST_NET=m | 731 | CONFIG_VHOST_NET=m |
722 | CONFIG_KEXEC_FILE=y | ||
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig index 20ed149e1137..c105bcc6d7a6 100644 --- a/arch/s390/configs/performance_defconfig +++ b/arch/s390/configs/performance_defconfig | |||
@@ -25,13 +25,13 @@ CONFIG_CPUSETS=y | |||
25 | CONFIG_CGROUP_DEVICE=y | 25 | CONFIG_CGROUP_DEVICE=y |
26 | CONFIG_CGROUP_CPUACCT=y | 26 | CONFIG_CGROUP_CPUACCT=y |
27 | CONFIG_CGROUP_PERF=y | 27 | CONFIG_CGROUP_PERF=y |
28 | CONFIG_CHECKPOINT_RESTORE=y | ||
29 | CONFIG_NAMESPACES=y | 28 | CONFIG_NAMESPACES=y |
30 | CONFIG_USER_NS=y | 29 | CONFIG_USER_NS=y |
31 | CONFIG_SCHED_AUTOGROUP=y | 30 | CONFIG_SCHED_AUTOGROUP=y |
32 | CONFIG_BLK_DEV_INITRD=y | 31 | CONFIG_BLK_DEV_INITRD=y |
33 | CONFIG_EXPERT=y | 32 | CONFIG_EXPERT=y |
34 | # CONFIG_SYSFS_SYSCALL is not set | 33 | # CONFIG_SYSFS_SYSCALL is not set |
34 | CONFIG_CHECKPOINT_RESTORE=y | ||
35 | CONFIG_BPF_SYSCALL=y | 35 | CONFIG_BPF_SYSCALL=y |
36 | CONFIG_USERFAULTFD=y | 36 | CONFIG_USERFAULTFD=y |
37 | # CONFIG_COMPAT_BRK is not set | 37 | # CONFIG_COMPAT_BRK is not set |
@@ -45,6 +45,8 @@ CONFIG_MODULE_UNLOAD=y | |||
45 | CONFIG_MODULE_FORCE_UNLOAD=y | 45 | CONFIG_MODULE_FORCE_UNLOAD=y |
46 | CONFIG_MODVERSIONS=y | 46 | CONFIG_MODVERSIONS=y |
47 | CONFIG_MODULE_SRCVERSION_ALL=y | 47 | CONFIG_MODULE_SRCVERSION_ALL=y |
48 | CONFIG_MODULE_SIG=y | ||
49 | CONFIG_MODULE_SIG_SHA256=y | ||
48 | CONFIG_BLK_DEV_INTEGRITY=y | 50 | CONFIG_BLK_DEV_INTEGRITY=y |
49 | CONFIG_BLK_DEV_THROTTLING=y | 51 | CONFIG_BLK_DEV_THROTTLING=y |
50 | CONFIG_BLK_WBT=y | 52 | CONFIG_BLK_WBT=y |
@@ -62,6 +64,7 @@ CONFIG_TUNE_ZEC12=y | |||
62 | CONFIG_NR_CPUS=512 | 64 | CONFIG_NR_CPUS=512 |
63 | CONFIG_NUMA=y | 65 | CONFIG_NUMA=y |
64 | CONFIG_HZ_100=y | 66 | CONFIG_HZ_100=y |
67 | CONFIG_KEXEC_FILE=y | ||
65 | CONFIG_MEMORY_HOTPLUG=y | 68 | CONFIG_MEMORY_HOTPLUG=y |
66 | CONFIG_MEMORY_HOTREMOVE=y | 69 | CONFIG_MEMORY_HOTREMOVE=y |
67 | CONFIG_KSM=y | 70 | CONFIG_KSM=y |
@@ -301,7 +304,6 @@ CONFIG_IP6_NF_SECURITY=m | |||
301 | CONFIG_IP6_NF_NAT=m | 304 | CONFIG_IP6_NF_NAT=m |
302 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 305 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
303 | CONFIG_NF_TABLES_BRIDGE=m | 306 | CONFIG_NF_TABLES_BRIDGE=m |
304 | CONFIG_NET_SCTPPROBE=m | ||
305 | CONFIG_RDS=m | 307 | CONFIG_RDS=m |
306 | CONFIG_RDS_RDMA=m | 308 | CONFIG_RDS_RDMA=m |
307 | CONFIG_RDS_TCP=m | 309 | CONFIG_RDS_TCP=m |
@@ -359,11 +361,11 @@ CONFIG_NET_ACT_SIMP=m | |||
359 | CONFIG_NET_ACT_SKBEDIT=m | 361 | CONFIG_NET_ACT_SKBEDIT=m |
360 | CONFIG_NET_ACT_CSUM=m | 362 | CONFIG_NET_ACT_CSUM=m |
361 | CONFIG_DNS_RESOLVER=y | 363 | CONFIG_DNS_RESOLVER=y |
364 | CONFIG_OPENVSWITCH=m | ||
362 | CONFIG_NETLINK_DIAG=m | 365 | CONFIG_NETLINK_DIAG=m |
363 | CONFIG_CGROUP_NET_PRIO=y | 366 | CONFIG_CGROUP_NET_PRIO=y |
364 | CONFIG_BPF_JIT=y | 367 | CONFIG_BPF_JIT=y |
365 | CONFIG_NET_PKTGEN=m | 368 | CONFIG_NET_PKTGEN=m |
366 | CONFIG_NET_TCPPROBE=m | ||
367 | CONFIG_DEVTMPFS=y | 369 | CONFIG_DEVTMPFS=y |
368 | CONFIG_DMA_CMA=y | 370 | CONFIG_DMA_CMA=y |
369 | CONFIG_CMA_SIZE_MBYTES=0 | 371 | CONFIG_CMA_SIZE_MBYTES=0 |
@@ -375,8 +377,9 @@ CONFIG_BLK_DEV_DRBD=m | |||
375 | CONFIG_BLK_DEV_NBD=m | 377 | CONFIG_BLK_DEV_NBD=m |
376 | CONFIG_BLK_DEV_RAM=y | 378 | CONFIG_BLK_DEV_RAM=y |
377 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 379 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
378 | CONFIG_BLK_DEV_RAM_DAX=y | ||
379 | CONFIG_VIRTIO_BLK=y | 380 | CONFIG_VIRTIO_BLK=y |
381 | CONFIG_BLK_DEV_RBD=m | ||
382 | CONFIG_BLK_DEV_NVME=m | ||
380 | CONFIG_ENCLOSURE_SERVICES=m | 383 | CONFIG_ENCLOSURE_SERVICES=m |
381 | CONFIG_GENWQE=m | 384 | CONFIG_GENWQE=m |
382 | CONFIG_RAID_ATTRS=m | 385 | CONFIG_RAID_ATTRS=m |
@@ -455,6 +458,7 @@ CONFIG_PPTP=m | |||
455 | CONFIG_PPPOL2TP=m | 458 | CONFIG_PPPOL2TP=m |
456 | CONFIG_PPP_ASYNC=m | 459 | CONFIG_PPP_ASYNC=m |
457 | CONFIG_PPP_SYNC_TTY=m | 460 | CONFIG_PPP_SYNC_TTY=m |
461 | CONFIG_INPUT_EVDEV=y | ||
458 | # CONFIG_INPUT_KEYBOARD is not set | 462 | # CONFIG_INPUT_KEYBOARD is not set |
459 | # CONFIG_INPUT_MOUSE is not set | 463 | # CONFIG_INPUT_MOUSE is not set |
460 | # CONFIG_SERIO is not set | 464 | # CONFIG_SERIO is not set |
@@ -468,6 +472,9 @@ CONFIG_WATCHDOG=y | |||
468 | CONFIG_WATCHDOG_NOWAYOUT=y | 472 | CONFIG_WATCHDOG_NOWAYOUT=y |
469 | CONFIG_SOFT_WATCHDOG=m | 473 | CONFIG_SOFT_WATCHDOG=m |
470 | CONFIG_DIAG288_WATCHDOG=m | 474 | CONFIG_DIAG288_WATCHDOG=m |
475 | CONFIG_DRM=y | ||
476 | CONFIG_DRM_VIRTIO_GPU=y | ||
477 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
471 | # CONFIG_HID is not set | 478 | # CONFIG_HID is not set |
472 | # CONFIG_USB_SUPPORT is not set | 479 | # CONFIG_USB_SUPPORT is not set |
473 | CONFIG_INFINIBAND=m | 480 | CONFIG_INFINIBAND=m |
@@ -476,7 +483,9 @@ CONFIG_MLX4_INFINIBAND=m | |||
476 | CONFIG_MLX5_INFINIBAND=m | 483 | CONFIG_MLX5_INFINIBAND=m |
477 | CONFIG_VFIO=m | 484 | CONFIG_VFIO=m |
478 | CONFIG_VFIO_PCI=m | 485 | CONFIG_VFIO_PCI=m |
486 | CONFIG_VIRTIO_PCI=m | ||
479 | CONFIG_VIRTIO_BALLOON=m | 487 | CONFIG_VIRTIO_BALLOON=m |
488 | CONFIG_VIRTIO_INPUT=y | ||
480 | CONFIG_EXT4_FS=y | 489 | CONFIG_EXT4_FS=y |
481 | CONFIG_EXT4_FS_POSIX_ACL=y | 490 | CONFIG_EXT4_FS_POSIX_ACL=y |
482 | CONFIG_EXT4_FS_SECURITY=y | 491 | CONFIG_EXT4_FS_SECURITY=y |
@@ -507,7 +516,6 @@ CONFIG_AUTOFS4_FS=m | |||
507 | CONFIG_FUSE_FS=y | 516 | CONFIG_FUSE_FS=y |
508 | CONFIG_CUSE=m | 517 | CONFIG_CUSE=m |
509 | CONFIG_OVERLAY_FS=m | 518 | CONFIG_OVERLAY_FS=m |
510 | CONFIG_OVERLAY_FS_REDIRECT_DIR=y | ||
511 | CONFIG_FSCACHE=m | 519 | CONFIG_FSCACHE=m |
512 | CONFIG_CACHEFILES=m | 520 | CONFIG_CACHEFILES=m |
513 | CONFIG_ISO9660_FS=y | 521 | CONFIG_ISO9660_FS=y |
@@ -592,8 +600,10 @@ CONFIG_SECURITY_SELINUX_DISABLE=y | |||
592 | CONFIG_INTEGRITY_SIGNATURE=y | 600 | CONFIG_INTEGRITY_SIGNATURE=y |
593 | CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y | 601 | CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y |
594 | CONFIG_IMA=y | 602 | CONFIG_IMA=y |
603 | CONFIG_IMA_DEFAULT_HASH_SHA256=y | ||
595 | CONFIG_IMA_WRITE_POLICY=y | 604 | CONFIG_IMA_WRITE_POLICY=y |
596 | CONFIG_IMA_APPRAISE=y | 605 | CONFIG_IMA_APPRAISE=y |
606 | CONFIG_CRYPTO_FIPS=y | ||
597 | CONFIG_CRYPTO_DH=m | 607 | CONFIG_CRYPTO_DH=m |
598 | CONFIG_CRYPTO_ECDH=m | 608 | CONFIG_CRYPTO_ECDH=m |
599 | CONFIG_CRYPTO_USER=m | 609 | CONFIG_CRYPTO_USER=m |
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 46a3178d8bc6..f40600eb1762 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
@@ -8,6 +8,7 @@ CONFIG_TASKSTATS=y | |||
8 | CONFIG_TASK_DELAY_ACCT=y | 8 | CONFIG_TASK_DELAY_ACCT=y |
9 | CONFIG_TASK_XACCT=y | 9 | CONFIG_TASK_XACCT=y |
10 | CONFIG_TASK_IO_ACCOUNTING=y | 10 | CONFIG_TASK_IO_ACCOUNTING=y |
11 | # CONFIG_CPU_ISOLATION is not set | ||
11 | CONFIG_IKCONFIG=y | 12 | CONFIG_IKCONFIG=y |
12 | CONFIG_IKCONFIG_PROC=y | 13 | CONFIG_IKCONFIG_PROC=y |
13 | CONFIG_CGROUPS=y | 14 | CONFIG_CGROUPS=y |
@@ -23,12 +24,12 @@ CONFIG_CPUSETS=y | |||
23 | CONFIG_CGROUP_DEVICE=y | 24 | CONFIG_CGROUP_DEVICE=y |
24 | CONFIG_CGROUP_CPUACCT=y | 25 | CONFIG_CGROUP_CPUACCT=y |
25 | CONFIG_CGROUP_PERF=y | 26 | CONFIG_CGROUP_PERF=y |
26 | CONFIG_CHECKPOINT_RESTORE=y | ||
27 | CONFIG_NAMESPACES=y | 27 | CONFIG_NAMESPACES=y |
28 | CONFIG_USER_NS=y | 28 | CONFIG_USER_NS=y |
29 | CONFIG_BLK_DEV_INITRD=y | 29 | CONFIG_BLK_DEV_INITRD=y |
30 | CONFIG_EXPERT=y | 30 | CONFIG_EXPERT=y |
31 | # CONFIG_SYSFS_SYSCALL is not set | 31 | # CONFIG_SYSFS_SYSCALL is not set |
32 | CONFIG_CHECKPOINT_RESTORE=y | ||
32 | CONFIG_BPF_SYSCALL=y | 33 | CONFIG_BPF_SYSCALL=y |
33 | CONFIG_USERFAULTFD=y | 34 | CONFIG_USERFAULTFD=y |
34 | # CONFIG_COMPAT_BRK is not set | 35 | # CONFIG_COMPAT_BRK is not set |
@@ -47,6 +48,7 @@ CONFIG_LIVEPATCH=y | |||
47 | CONFIG_NR_CPUS=256 | 48 | CONFIG_NR_CPUS=256 |
48 | CONFIG_NUMA=y | 49 | CONFIG_NUMA=y |
49 | CONFIG_HZ_100=y | 50 | CONFIG_HZ_100=y |
51 | CONFIG_KEXEC_FILE=y | ||
50 | CONFIG_MEMORY_HOTPLUG=y | 52 | CONFIG_MEMORY_HOTPLUG=y |
51 | CONFIG_MEMORY_HOTREMOVE=y | 53 | CONFIG_MEMORY_HOTREMOVE=y |
52 | CONFIG_KSM=y | 54 | CONFIG_KSM=y |
@@ -129,10 +131,13 @@ CONFIG_EQUALIZER=m | |||
129 | CONFIG_TUN=m | 131 | CONFIG_TUN=m |
130 | CONFIG_VIRTIO_NET=y | 132 | CONFIG_VIRTIO_NET=y |
131 | # CONFIG_NET_VENDOR_ALACRITECH is not set | 133 | # CONFIG_NET_VENDOR_ALACRITECH is not set |
134 | # CONFIG_NET_VENDOR_CORTINA is not set | ||
132 | # CONFIG_NET_VENDOR_SOLARFLARE is not set | 135 | # CONFIG_NET_VENDOR_SOLARFLARE is not set |
136 | # CONFIG_NET_VENDOR_SOCIONEXT is not set | ||
133 | # CONFIG_NET_VENDOR_SYNOPSYS is not set | 137 | # CONFIG_NET_VENDOR_SYNOPSYS is not set |
134 | # CONFIG_INPUT is not set | 138 | # CONFIG_INPUT is not set |
135 | # CONFIG_SERIO is not set | 139 | # CONFIG_SERIO is not set |
140 | # CONFIG_VT is not set | ||
136 | CONFIG_DEVKMEM=y | 141 | CONFIG_DEVKMEM=y |
137 | CONFIG_RAW_DRIVER=m | 142 | CONFIG_RAW_DRIVER=m |
138 | CONFIG_VIRTIO_BALLOON=y | 143 | CONFIG_VIRTIO_BALLOON=y |
@@ -177,13 +182,15 @@ CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y | |||
177 | CONFIG_STACK_TRACER=y | 182 | CONFIG_STACK_TRACER=y |
178 | CONFIG_BLK_DEV_IO_TRACE=y | 183 | CONFIG_BLK_DEV_IO_TRACE=y |
179 | CONFIG_FUNCTION_PROFILER=y | 184 | CONFIG_FUNCTION_PROFILER=y |
180 | CONFIG_KPROBES_SANITY_TEST=y | 185 | # CONFIG_RUNTIME_TESTING_MENU is not set |
181 | CONFIG_S390_PTDUMP=y | 186 | CONFIG_S390_PTDUMP=y |
182 | CONFIG_CRYPTO_CRYPTD=m | 187 | CONFIG_CRYPTO_CRYPTD=m |
188 | CONFIG_CRYPTO_AUTHENC=m | ||
183 | CONFIG_CRYPTO_TEST=m | 189 | CONFIG_CRYPTO_TEST=m |
184 | CONFIG_CRYPTO_CCM=m | 190 | CONFIG_CRYPTO_CCM=m |
185 | CONFIG_CRYPTO_GCM=m | 191 | CONFIG_CRYPTO_GCM=m |
186 | CONFIG_CRYPTO_CBC=y | 192 | CONFIG_CRYPTO_CBC=y |
193 | CONFIG_CRYPTO_CFB=m | ||
187 | CONFIG_CRYPTO_CTS=m | 194 | CONFIG_CRYPTO_CTS=m |
188 | CONFIG_CRYPTO_LRW=m | 195 | CONFIG_CRYPTO_LRW=m |
189 | CONFIG_CRYPTO_PCBC=m | 196 | CONFIG_CRYPTO_PCBC=m |
@@ -213,6 +220,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
213 | CONFIG_CRYPTO_SALSA20=m | 220 | CONFIG_CRYPTO_SALSA20=m |
214 | CONFIG_CRYPTO_SEED=m | 221 | CONFIG_CRYPTO_SEED=m |
215 | CONFIG_CRYPTO_SERPENT=m | 222 | CONFIG_CRYPTO_SERPENT=m |
223 | CONFIG_CRYPTO_SM4=m | ||
224 | CONFIG_CRYPTO_SPECK=m | ||
216 | CONFIG_CRYPTO_TEA=m | 225 | CONFIG_CRYPTO_TEA=m |
217 | CONFIG_CRYPTO_TWOFISH=m | 226 | CONFIG_CRYPTO_TWOFISH=m |
218 | CONFIG_CRYPTO_DEFLATE=m | 227 | CONFIG_CRYPTO_DEFLATE=m |