diff options
Diffstat (limited to 'arch/s390/defconfig')
| -rw-r--r-- | arch/s390/defconfig | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 5368cf4a350e..7c621b8ef683 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
| @@ -108,6 +108,8 @@ CONFIG_DEFAULT_MIGRATION_COST=1000000 | |||
| 108 | CONFIG_COMPAT=y | 108 | CONFIG_COMPAT=y |
| 109 | CONFIG_SYSVIPC_COMPAT=y | 109 | CONFIG_SYSVIPC_COMPAT=y |
| 110 | CONFIG_AUDIT_ARCH=y | 110 | CONFIG_AUDIT_ARCH=y |
| 111 | CONFIG_S390_SWITCH_AMODE=y | ||
| 112 | CONFIG_S390_EXEC_PROTECT=y | ||
| 111 | 113 | ||
| 112 | # | 114 | # |
| 113 | # Code generation options | 115 | # Code generation options |
| @@ -431,7 +433,6 @@ CONFIG_TN3270_CONSOLE=y | |||
| 431 | CONFIG_TN3215=y | 433 | CONFIG_TN3215=y |
| 432 | CONFIG_TN3215_CONSOLE=y | 434 | CONFIG_TN3215_CONSOLE=y |
| 433 | CONFIG_CCW_CONSOLE=y | 435 | CONFIG_CCW_CONSOLE=y |
| 434 | CONFIG_SCLP=y | ||
| 435 | CONFIG_SCLP_TTY=y | 436 | CONFIG_SCLP_TTY=y |
| 436 | CONFIG_SCLP_CONSOLE=y | 437 | CONFIG_SCLP_CONSOLE=y |
| 437 | CONFIG_SCLP_VT220_TTY=y | 438 | CONFIG_SCLP_VT220_TTY=y |
| @@ -724,9 +725,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 724 | # CONFIG_CRYPTO_MD4 is not set | 725 | # CONFIG_CRYPTO_MD4 is not set |
| 725 | # CONFIG_CRYPTO_MD5 is not set | 726 | # CONFIG_CRYPTO_MD5 is not set |
| 726 | # CONFIG_CRYPTO_SHA1 is not set | 727 | # CONFIG_CRYPTO_SHA1 is not set |
| 727 | # CONFIG_CRYPTO_SHA1_S390 is not set | ||
| 728 | # CONFIG_CRYPTO_SHA256 is not set | 728 | # CONFIG_CRYPTO_SHA256 is not set |
| 729 | # CONFIG_CRYPTO_SHA256_S390 is not set | ||
| 730 | # CONFIG_CRYPTO_SHA512 is not set | 729 | # CONFIG_CRYPTO_SHA512 is not set |
| 731 | # CONFIG_CRYPTO_WP512 is not set | 730 | # CONFIG_CRYPTO_WP512 is not set |
| 732 | # CONFIG_CRYPTO_TGR192 is not set | 731 | # CONFIG_CRYPTO_TGR192 is not set |
| @@ -735,12 +734,10 @@ CONFIG_CRYPTO_ECB=m | |||
| 735 | CONFIG_CRYPTO_CBC=y | 734 | CONFIG_CRYPTO_CBC=y |
| 736 | # CONFIG_CRYPTO_LRW is not set | 735 | # CONFIG_CRYPTO_LRW is not set |
| 737 | # CONFIG_CRYPTO_DES is not set | 736 | # CONFIG_CRYPTO_DES is not set |
| 738 | # CONFIG_CRYPTO_DES_S390 is not set | ||
| 739 | # CONFIG_CRYPTO_BLOWFISH is not set | 737 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 740 | # CONFIG_CRYPTO_TWOFISH is not set | 738 | # CONFIG_CRYPTO_TWOFISH is not set |
| 741 | # CONFIG_CRYPTO_SERPENT is not set | 739 | # CONFIG_CRYPTO_SERPENT is not set |
| 742 | # CONFIG_CRYPTO_AES is not set | 740 | # CONFIG_CRYPTO_AES is not set |
| 743 | # CONFIG_CRYPTO_AES_S390 is not set | ||
| 744 | # CONFIG_CRYPTO_CAST5 is not set | 741 | # CONFIG_CRYPTO_CAST5 is not set |
| 745 | # CONFIG_CRYPTO_CAST6 is not set | 742 | # CONFIG_CRYPTO_CAST6 is not set |
| 746 | # CONFIG_CRYPTO_TEA is not set | 743 | # CONFIG_CRYPTO_TEA is not set |
| @@ -755,6 +752,11 @@ CONFIG_CRYPTO_CBC=y | |||
| 755 | # | 752 | # |
| 756 | # Hardware crypto devices | 753 | # Hardware crypto devices |
| 757 | # | 754 | # |
| 755 | # CONFIG_CRYPTO_SHA1_S390 is not set | ||
| 756 | # CONFIG_CRYPTO_SHA256_S390 is not set | ||
| 757 | # CONFIG_CRYPTO_DES_S390 is not set | ||
| 758 | # CONFIG_CRYPTO_AES_S390 is not set | ||
| 759 | CONFIG_S390_PRNG=m | ||
| 758 | 760 | ||
| 759 | # | 761 | # |
| 760 | # Library routines | 762 | # Library routines |