diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2019-10-04 09:05:03 -0400 |
---|---|---|
committer | Vasily Gorbik <gor@linux.ibm.com> | 2019-10-04 10:37:33 -0400 |
commit | 61c313471574de93c63868689d42cd9fff297a1a (patch) | |
tree | 1b59a559c3d1538dc4908854d76fb3619480445d /arch/s390 | |
parent | 771c24f6da06042e8aa8303e37c069fa01f96a09 (diff) |
s390: update defconfigs
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/configs/debug_defconfig | 24 | ||||
-rw-r--r-- | arch/s390/configs/defconfig | 25 | ||||
-rw-r--r-- | arch/s390/configs/zfcpdump_defconfig | 2 |
3 files changed, 33 insertions, 18 deletions
diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig index 347f48702edb..38d64030aacf 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig | |||
@@ -44,6 +44,7 @@ CONFIG_NR_CPUS=512 | |||
44 | CONFIG_NUMA=y | 44 | CONFIG_NUMA=y |
45 | CONFIG_HZ_100=y | 45 | CONFIG_HZ_100=y |
46 | CONFIG_KEXEC_FILE=y | 46 | CONFIG_KEXEC_FILE=y |
47 | CONFIG_KEXEC_SIG=y | ||
47 | CONFIG_EXPOLINE=y | 48 | CONFIG_EXPOLINE=y |
48 | CONFIG_EXPOLINE_AUTO=y | 49 | CONFIG_EXPOLINE_AUTO=y |
49 | CONFIG_CHSC_SCH=y | 50 | CONFIG_CHSC_SCH=y |
@@ -69,12 +70,13 @@ CONFIG_MODULE_UNLOAD=y | |||
69 | CONFIG_MODULE_FORCE_UNLOAD=y | 70 | CONFIG_MODULE_FORCE_UNLOAD=y |
70 | CONFIG_MODVERSIONS=y | 71 | CONFIG_MODVERSIONS=y |
71 | CONFIG_MODULE_SRCVERSION_ALL=y | 72 | CONFIG_MODULE_SRCVERSION_ALL=y |
72 | CONFIG_MODULE_SIG=y | ||
73 | CONFIG_MODULE_SIG_SHA256=y | 73 | CONFIG_MODULE_SIG_SHA256=y |
74 | CONFIG_UNUSED_SYMBOLS=y | ||
74 | CONFIG_BLK_DEV_INTEGRITY=y | 75 | CONFIG_BLK_DEV_INTEGRITY=y |
75 | CONFIG_BLK_DEV_THROTTLING=y | 76 | CONFIG_BLK_DEV_THROTTLING=y |
76 | CONFIG_BLK_WBT=y | 77 | CONFIG_BLK_WBT=y |
77 | CONFIG_BLK_CGROUP_IOLATENCY=y | 78 | CONFIG_BLK_CGROUP_IOLATENCY=y |
79 | CONFIG_BLK_CGROUP_IOCOST=y | ||
78 | CONFIG_PARTITION_ADVANCED=y | 80 | CONFIG_PARTITION_ADVANCED=y |
79 | CONFIG_IBM_PARTITION=y | 81 | CONFIG_IBM_PARTITION=y |
80 | CONFIG_BSD_DISKLABEL=y | 82 | CONFIG_BSD_DISKLABEL=y |
@@ -370,6 +372,7 @@ CONFIG_NETLINK_DIAG=m | |||
370 | CONFIG_CGROUP_NET_PRIO=y | 372 | CONFIG_CGROUP_NET_PRIO=y |
371 | CONFIG_BPF_JIT=y | 373 | CONFIG_BPF_JIT=y |
372 | CONFIG_NET_PKTGEN=m | 374 | CONFIG_NET_PKTGEN=m |
375 | # CONFIG_NET_DROP_MONITOR is not set | ||
373 | CONFIG_PCI=y | 376 | CONFIG_PCI=y |
374 | CONFIG_PCI_DEBUG=y | 377 | CONFIG_PCI_DEBUG=y |
375 | CONFIG_HOTPLUG_PCI=y | 378 | CONFIG_HOTPLUG_PCI=y |
@@ -424,6 +427,7 @@ CONFIG_DM_CRYPT=m | |||
424 | CONFIG_DM_SNAPSHOT=m | 427 | CONFIG_DM_SNAPSHOT=m |
425 | CONFIG_DM_THIN_PROVISIONING=m | 428 | CONFIG_DM_THIN_PROVISIONING=m |
426 | CONFIG_DM_WRITECACHE=m | 429 | CONFIG_DM_WRITECACHE=m |
430 | CONFIG_DM_CLONE=m | ||
427 | CONFIG_DM_MIRROR=m | 431 | CONFIG_DM_MIRROR=m |
428 | CONFIG_DM_LOG_USERSPACE=m | 432 | CONFIG_DM_LOG_USERSPACE=m |
429 | CONFIG_DM_RAID=m | 433 | CONFIG_DM_RAID=m |
@@ -435,6 +439,7 @@ CONFIG_DM_DELAY=m | |||
435 | CONFIG_DM_UEVENT=y | 439 | CONFIG_DM_UEVENT=y |
436 | CONFIG_DM_FLAKEY=m | 440 | CONFIG_DM_FLAKEY=m |
437 | CONFIG_DM_VERITY=m | 441 | CONFIG_DM_VERITY=m |
442 | CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y | ||
438 | CONFIG_DM_SWITCH=m | 443 | CONFIG_DM_SWITCH=m |
439 | CONFIG_NETDEVICES=y | 444 | CONFIG_NETDEVICES=y |
440 | CONFIG_BONDING=m | 445 | CONFIG_BONDING=m |
@@ -489,6 +494,7 @@ CONFIG_MLX5_CORE_EN=y | |||
489 | # CONFIG_NET_VENDOR_NVIDIA is not set | 494 | # CONFIG_NET_VENDOR_NVIDIA is not set |
490 | # CONFIG_NET_VENDOR_OKI is not set | 495 | # CONFIG_NET_VENDOR_OKI is not set |
491 | # CONFIG_NET_VENDOR_PACKET_ENGINES is not set | 496 | # CONFIG_NET_VENDOR_PACKET_ENGINES is not set |
497 | # CONFIG_NET_VENDOR_PENSANDO is not set | ||
492 | # CONFIG_NET_VENDOR_QLOGIC is not set | 498 | # CONFIG_NET_VENDOR_QLOGIC is not set |
493 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 499 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
494 | # CONFIG_NET_VENDOR_RDC is not set | 500 | # CONFIG_NET_VENDOR_RDC is not set |
@@ -538,15 +544,16 @@ CONFIG_WATCHDOG=y | |||
538 | CONFIG_WATCHDOG_NOWAYOUT=y | 544 | CONFIG_WATCHDOG_NOWAYOUT=y |
539 | CONFIG_SOFT_WATCHDOG=m | 545 | CONFIG_SOFT_WATCHDOG=m |
540 | CONFIG_DIAG288_WATCHDOG=m | 546 | CONFIG_DIAG288_WATCHDOG=m |
541 | CONFIG_DRM=y | 547 | CONFIG_FB=y |
542 | CONFIG_DRM_VIRTIO_GPU=y | ||
543 | CONFIG_FRAMEBUFFER_CONSOLE=y | 548 | CONFIG_FRAMEBUFFER_CONSOLE=y |
549 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||
544 | # CONFIG_HID is not set | 550 | # CONFIG_HID is not set |
545 | # CONFIG_USB_SUPPORT is not set | 551 | # CONFIG_USB_SUPPORT is not set |
546 | CONFIG_INFINIBAND=m | 552 | CONFIG_INFINIBAND=m |
547 | CONFIG_INFINIBAND_USER_ACCESS=m | 553 | CONFIG_INFINIBAND_USER_ACCESS=m |
548 | CONFIG_MLX4_INFINIBAND=m | 554 | CONFIG_MLX4_INFINIBAND=m |
549 | CONFIG_MLX5_INFINIBAND=m | 555 | CONFIG_MLX5_INFINIBAND=m |
556 | CONFIG_SYNC_FILE=y | ||
550 | CONFIG_VFIO=m | 557 | CONFIG_VFIO=m |
551 | CONFIG_VFIO_PCI=m | 558 | CONFIG_VFIO_PCI=m |
552 | CONFIG_VFIO_MDEV=m | 559 | CONFIG_VFIO_MDEV=m |
@@ -580,6 +587,8 @@ CONFIG_NILFS2_FS=m | |||
580 | CONFIG_FS_DAX=y | 587 | CONFIG_FS_DAX=y |
581 | CONFIG_EXPORTFS_BLOCK_OPS=y | 588 | CONFIG_EXPORTFS_BLOCK_OPS=y |
582 | CONFIG_FS_ENCRYPTION=y | 589 | CONFIG_FS_ENCRYPTION=y |
590 | CONFIG_FS_VERITY=y | ||
591 | CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y | ||
583 | CONFIG_FANOTIFY=y | 592 | CONFIG_FANOTIFY=y |
584 | CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y | 593 | CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y |
585 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 594 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
@@ -589,6 +598,7 @@ CONFIG_QFMT_V2=m | |||
589 | CONFIG_AUTOFS4_FS=m | 598 | CONFIG_AUTOFS4_FS=m |
590 | CONFIG_FUSE_FS=y | 599 | CONFIG_FUSE_FS=y |
591 | CONFIG_CUSE=m | 600 | CONFIG_CUSE=m |
601 | CONFIG_VIRTIO_FS=m | ||
592 | CONFIG_OVERLAY_FS=m | 602 | CONFIG_OVERLAY_FS=m |
593 | CONFIG_FSCACHE=m | 603 | CONFIG_FSCACHE=m |
594 | CONFIG_CACHEFILES=m | 604 | CONFIG_CACHEFILES=m |
@@ -648,12 +658,15 @@ CONFIG_FORTIFY_SOURCE=y | |||
648 | CONFIG_SECURITY_SELINUX=y | 658 | CONFIG_SECURITY_SELINUX=y |
649 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | 659 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y |
650 | CONFIG_SECURITY_SELINUX_DISABLE=y | 660 | CONFIG_SECURITY_SELINUX_DISABLE=y |
661 | CONFIG_SECURITY_LOCKDOWN_LSM=y | ||
662 | CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y | ||
651 | CONFIG_INTEGRITY_SIGNATURE=y | 663 | CONFIG_INTEGRITY_SIGNATURE=y |
652 | CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y | 664 | CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y |
653 | CONFIG_IMA=y | 665 | CONFIG_IMA=y |
654 | CONFIG_IMA_DEFAULT_HASH_SHA256=y | 666 | CONFIG_IMA_DEFAULT_HASH_SHA256=y |
655 | CONFIG_IMA_WRITE_POLICY=y | 667 | CONFIG_IMA_WRITE_POLICY=y |
656 | CONFIG_IMA_APPRAISE=y | 668 | CONFIG_IMA_APPRAISE=y |
669 | CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor" | ||
657 | CONFIG_CRYPTO_USER=m | 670 | CONFIG_CRYPTO_USER=m |
658 | # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set | 671 | # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set |
659 | CONFIG_CRYPTO_PCRYPT=m | 672 | CONFIG_CRYPTO_PCRYPT=m |
@@ -664,10 +677,6 @@ CONFIG_CRYPTO_ECDH=m | |||
664 | CONFIG_CRYPTO_ECRDSA=m | 677 | CONFIG_CRYPTO_ECRDSA=m |
665 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 678 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
666 | CONFIG_CRYPTO_AEGIS128=m | 679 | CONFIG_CRYPTO_AEGIS128=m |
667 | CONFIG_CRYPTO_AEGIS128L=m | ||
668 | CONFIG_CRYPTO_AEGIS256=m | ||
669 | CONFIG_CRYPTO_MORUS640=m | ||
670 | CONFIG_CRYPTO_MORUS1280=m | ||
671 | CONFIG_CRYPTO_CFB=m | 680 | CONFIG_CRYPTO_CFB=m |
672 | CONFIG_CRYPTO_LRW=m | 681 | CONFIG_CRYPTO_LRW=m |
673 | CONFIG_CRYPTO_PCBC=m | 682 | CONFIG_CRYPTO_PCBC=m |
@@ -739,7 +748,6 @@ CONFIG_DEBUG_INFO=y | |||
739 | CONFIG_DEBUG_INFO_DWARF4=y | 748 | CONFIG_DEBUG_INFO_DWARF4=y |
740 | CONFIG_GDB_SCRIPTS=y | 749 | CONFIG_GDB_SCRIPTS=y |
741 | CONFIG_FRAME_WARN=1024 | 750 | CONFIG_FRAME_WARN=1024 |
742 | CONFIG_UNUSED_SYMBOLS=y | ||
743 | CONFIG_HEADERS_INSTALL=y | 751 | CONFIG_HEADERS_INSTALL=y |
744 | CONFIG_HEADERS_CHECK=y | 752 | CONFIG_HEADERS_CHECK=y |
745 | CONFIG_DEBUG_SECTION_MISMATCH=y | 753 | CONFIG_DEBUG_SECTION_MISMATCH=y |
diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index 8514b8b9500f..25f799849582 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig | |||
@@ -44,6 +44,7 @@ CONFIG_NUMA=y | |||
44 | # CONFIG_NUMA_EMU is not set | 44 | # CONFIG_NUMA_EMU is not set |
45 | CONFIG_HZ_100=y | 45 | CONFIG_HZ_100=y |
46 | CONFIG_KEXEC_FILE=y | 46 | CONFIG_KEXEC_FILE=y |
47 | CONFIG_KEXEC_SIG=y | ||
47 | CONFIG_EXPOLINE=y | 48 | CONFIG_EXPOLINE=y |
48 | CONFIG_EXPOLINE_AUTO=y | 49 | CONFIG_EXPOLINE_AUTO=y |
49 | CONFIG_CHSC_SCH=y | 50 | CONFIG_CHSC_SCH=y |
@@ -66,11 +67,12 @@ CONFIG_MODULE_UNLOAD=y | |||
66 | CONFIG_MODULE_FORCE_UNLOAD=y | 67 | CONFIG_MODULE_FORCE_UNLOAD=y |
67 | CONFIG_MODVERSIONS=y | 68 | CONFIG_MODVERSIONS=y |
68 | CONFIG_MODULE_SRCVERSION_ALL=y | 69 | CONFIG_MODULE_SRCVERSION_ALL=y |
69 | CONFIG_MODULE_SIG=y | ||
70 | CONFIG_MODULE_SIG_SHA256=y | 70 | CONFIG_MODULE_SIG_SHA256=y |
71 | CONFIG_UNUSED_SYMBOLS=y | ||
71 | CONFIG_BLK_DEV_THROTTLING=y | 72 | CONFIG_BLK_DEV_THROTTLING=y |
72 | CONFIG_BLK_WBT=y | 73 | CONFIG_BLK_WBT=y |
73 | CONFIG_BLK_CGROUP_IOLATENCY=y | 74 | CONFIG_BLK_CGROUP_IOLATENCY=y |
75 | CONFIG_BLK_CGROUP_IOCOST=y | ||
74 | CONFIG_PARTITION_ADVANCED=y | 76 | CONFIG_PARTITION_ADVANCED=y |
75 | CONFIG_IBM_PARTITION=y | 77 | CONFIG_IBM_PARTITION=y |
76 | CONFIG_BSD_DISKLABEL=y | 78 | CONFIG_BSD_DISKLABEL=y |
@@ -363,6 +365,7 @@ CONFIG_NETLINK_DIAG=m | |||
363 | CONFIG_CGROUP_NET_PRIO=y | 365 | CONFIG_CGROUP_NET_PRIO=y |
364 | CONFIG_BPF_JIT=y | 366 | CONFIG_BPF_JIT=y |
365 | CONFIG_NET_PKTGEN=m | 367 | CONFIG_NET_PKTGEN=m |
368 | # CONFIG_NET_DROP_MONITOR is not set | ||
366 | CONFIG_PCI=y | 369 | CONFIG_PCI=y |
367 | CONFIG_HOTPLUG_PCI=y | 370 | CONFIG_HOTPLUG_PCI=y |
368 | CONFIG_HOTPLUG_PCI_S390=y | 371 | CONFIG_HOTPLUG_PCI_S390=y |
@@ -418,6 +421,7 @@ CONFIG_DM_CRYPT=m | |||
418 | CONFIG_DM_SNAPSHOT=m | 421 | CONFIG_DM_SNAPSHOT=m |
419 | CONFIG_DM_THIN_PROVISIONING=m | 422 | CONFIG_DM_THIN_PROVISIONING=m |
420 | CONFIG_DM_WRITECACHE=m | 423 | CONFIG_DM_WRITECACHE=m |
424 | CONFIG_DM_CLONE=m | ||
421 | CONFIG_DM_MIRROR=m | 425 | CONFIG_DM_MIRROR=m |
422 | CONFIG_DM_LOG_USERSPACE=m | 426 | CONFIG_DM_LOG_USERSPACE=m |
423 | CONFIG_DM_RAID=m | 427 | CONFIG_DM_RAID=m |
@@ -429,6 +433,7 @@ CONFIG_DM_DELAY=m | |||
429 | CONFIG_DM_UEVENT=y | 433 | CONFIG_DM_UEVENT=y |
430 | CONFIG_DM_FLAKEY=m | 434 | CONFIG_DM_FLAKEY=m |
431 | CONFIG_DM_VERITY=m | 435 | CONFIG_DM_VERITY=m |
436 | CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y | ||
432 | CONFIG_DM_SWITCH=m | 437 | CONFIG_DM_SWITCH=m |
433 | CONFIG_DM_INTEGRITY=m | 438 | CONFIG_DM_INTEGRITY=m |
434 | CONFIG_NETDEVICES=y | 439 | CONFIG_NETDEVICES=y |
@@ -484,6 +489,7 @@ CONFIG_MLX5_CORE_EN=y | |||
484 | # CONFIG_NET_VENDOR_NVIDIA is not set | 489 | # CONFIG_NET_VENDOR_NVIDIA is not set |
485 | # CONFIG_NET_VENDOR_OKI is not set | 490 | # CONFIG_NET_VENDOR_OKI is not set |
486 | # CONFIG_NET_VENDOR_PACKET_ENGINES is not set | 491 | # CONFIG_NET_VENDOR_PACKET_ENGINES is not set |
492 | # CONFIG_NET_VENDOR_PENSANDO is not set | ||
487 | # CONFIG_NET_VENDOR_QLOGIC is not set | 493 | # CONFIG_NET_VENDOR_QLOGIC is not set |
488 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 494 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
489 | # CONFIG_NET_VENDOR_RDC is not set | 495 | # CONFIG_NET_VENDOR_RDC is not set |
@@ -533,16 +539,16 @@ CONFIG_WATCHDOG_CORE=y | |||
533 | CONFIG_WATCHDOG_NOWAYOUT=y | 539 | CONFIG_WATCHDOG_NOWAYOUT=y |
534 | CONFIG_SOFT_WATCHDOG=m | 540 | CONFIG_SOFT_WATCHDOG=m |
535 | CONFIG_DIAG288_WATCHDOG=m | 541 | CONFIG_DIAG288_WATCHDOG=m |
536 | CONFIG_DRM=y | 542 | CONFIG_FB=y |
537 | CONFIG_DRM_VIRTIO_GPU=y | ||
538 | # CONFIG_BACKLIGHT_CLASS_DEVICE is not set | ||
539 | CONFIG_FRAMEBUFFER_CONSOLE=y | 543 | CONFIG_FRAMEBUFFER_CONSOLE=y |
544 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||
540 | # CONFIG_HID is not set | 545 | # CONFIG_HID is not set |
541 | # CONFIG_USB_SUPPORT is not set | 546 | # CONFIG_USB_SUPPORT is not set |
542 | CONFIG_INFINIBAND=m | 547 | CONFIG_INFINIBAND=m |
543 | CONFIG_INFINIBAND_USER_ACCESS=m | 548 | CONFIG_INFINIBAND_USER_ACCESS=m |
544 | CONFIG_MLX4_INFINIBAND=m | 549 | CONFIG_MLX4_INFINIBAND=m |
545 | CONFIG_MLX5_INFINIBAND=m | 550 | CONFIG_MLX5_INFINIBAND=m |
551 | CONFIG_SYNC_FILE=y | ||
546 | CONFIG_VFIO=m | 552 | CONFIG_VFIO=m |
547 | CONFIG_VFIO_PCI=m | 553 | CONFIG_VFIO_PCI=m |
548 | CONFIG_VFIO_MDEV=m | 554 | CONFIG_VFIO_MDEV=m |
@@ -573,6 +579,8 @@ CONFIG_NILFS2_FS=m | |||
573 | CONFIG_FS_DAX=y | 579 | CONFIG_FS_DAX=y |
574 | CONFIG_EXPORTFS_BLOCK_OPS=y | 580 | CONFIG_EXPORTFS_BLOCK_OPS=y |
575 | CONFIG_FS_ENCRYPTION=y | 581 | CONFIG_FS_ENCRYPTION=y |
582 | CONFIG_FS_VERITY=y | ||
583 | CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y | ||
576 | CONFIG_FANOTIFY=y | 584 | CONFIG_FANOTIFY=y |
577 | CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y | 585 | CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y |
578 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 586 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
@@ -581,6 +589,7 @@ CONFIG_QFMT_V2=m | |||
581 | CONFIG_AUTOFS4_FS=m | 589 | CONFIG_AUTOFS4_FS=m |
582 | CONFIG_FUSE_FS=y | 590 | CONFIG_FUSE_FS=y |
583 | CONFIG_CUSE=m | 591 | CONFIG_CUSE=m |
592 | CONFIG_VIRTIO_FS=m | ||
584 | CONFIG_OVERLAY_FS=m | 593 | CONFIG_OVERLAY_FS=m |
585 | CONFIG_FSCACHE=m | 594 | CONFIG_FSCACHE=m |
586 | CONFIG_CACHEFILES=m | 595 | CONFIG_CACHEFILES=m |
@@ -639,12 +648,15 @@ CONFIG_SECURITY_NETWORK=y | |||
639 | CONFIG_SECURITY_SELINUX=y | 648 | CONFIG_SECURITY_SELINUX=y |
640 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | 649 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y |
641 | CONFIG_SECURITY_SELINUX_DISABLE=y | 650 | CONFIG_SECURITY_SELINUX_DISABLE=y |
651 | CONFIG_SECURITY_LOCKDOWN_LSM=y | ||
652 | CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y | ||
642 | CONFIG_INTEGRITY_SIGNATURE=y | 653 | CONFIG_INTEGRITY_SIGNATURE=y |
643 | CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y | 654 | CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y |
644 | CONFIG_IMA=y | 655 | CONFIG_IMA=y |
645 | CONFIG_IMA_DEFAULT_HASH_SHA256=y | 656 | CONFIG_IMA_DEFAULT_HASH_SHA256=y |
646 | CONFIG_IMA_WRITE_POLICY=y | 657 | CONFIG_IMA_WRITE_POLICY=y |
647 | CONFIG_IMA_APPRAISE=y | 658 | CONFIG_IMA_APPRAISE=y |
659 | CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor" | ||
648 | CONFIG_CRYPTO_FIPS=y | 660 | CONFIG_CRYPTO_FIPS=y |
649 | CONFIG_CRYPTO_USER=m | 661 | CONFIG_CRYPTO_USER=m |
650 | # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set | 662 | # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set |
@@ -656,10 +668,6 @@ CONFIG_CRYPTO_ECDH=m | |||
656 | CONFIG_CRYPTO_ECRDSA=m | 668 | CONFIG_CRYPTO_ECRDSA=m |
657 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 669 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
658 | CONFIG_CRYPTO_AEGIS128=m | 670 | CONFIG_CRYPTO_AEGIS128=m |
659 | CONFIG_CRYPTO_AEGIS128L=m | ||
660 | CONFIG_CRYPTO_AEGIS256=m | ||
661 | CONFIG_CRYPTO_MORUS640=m | ||
662 | CONFIG_CRYPTO_MORUS1280=m | ||
663 | CONFIG_CRYPTO_CFB=m | 671 | CONFIG_CRYPTO_CFB=m |
664 | CONFIG_CRYPTO_LRW=m | 672 | CONFIG_CRYPTO_LRW=m |
665 | CONFIG_CRYPTO_OFB=m | 673 | CONFIG_CRYPTO_OFB=m |
@@ -727,7 +735,6 @@ CONFIG_DEBUG_INFO=y | |||
727 | CONFIG_DEBUG_INFO_DWARF4=y | 735 | CONFIG_DEBUG_INFO_DWARF4=y |
728 | CONFIG_GDB_SCRIPTS=y | 736 | CONFIG_GDB_SCRIPTS=y |
729 | CONFIG_FRAME_WARN=1024 | 737 | CONFIG_FRAME_WARN=1024 |
730 | CONFIG_UNUSED_SYMBOLS=y | ||
731 | CONFIG_DEBUG_SECTION_MISMATCH=y | 738 | CONFIG_DEBUG_SECTION_MISMATCH=y |
732 | CONFIG_MAGIC_SYSRQ=y | 739 | CONFIG_MAGIC_SYSRQ=y |
733 | CONFIG_DEBUG_MEMORY_INIT=y | 740 | CONFIG_DEBUG_MEMORY_INIT=y |
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig index be09a208b608..20c51e5d9353 100644 --- a/arch/s390/configs/zfcpdump_defconfig +++ b/arch/s390/configs/zfcpdump_defconfig | |||
@@ -61,7 +61,7 @@ CONFIG_RAW_DRIVER=y | |||
61 | CONFIG_CONFIGFS_FS=y | 61 | CONFIG_CONFIGFS_FS=y |
62 | # CONFIG_MISC_FILESYSTEMS is not set | 62 | # CONFIG_MISC_FILESYSTEMS is not set |
63 | # CONFIG_NETWORK_FILESYSTEMS is not set | 63 | # CONFIG_NETWORK_FILESYSTEMS is not set |
64 | # CONFIG_DIMLIB is not set | 64 | CONFIG_LSM="yama,loadpin,safesetid,integrity" |
65 | CONFIG_PRINTK_TIME=y | 65 | CONFIG_PRINTK_TIME=y |
66 | CONFIG_DEBUG_INFO=y | 66 | CONFIG_DEBUG_INFO=y |
67 | CONFIG_DEBUG_FS=y | 67 | CONFIG_DEBUG_FS=y |