diff options
Diffstat (limited to 'arch/s390/defconfig')
| -rw-r--r-- | arch/s390/defconfig | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 5368cf4a350e..1406400bf3ea 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 |
| @@ -177,6 +179,8 @@ CONFIG_XFRM=y | |||
| 177 | # CONFIG_XFRM_USER is not set | 179 | # CONFIG_XFRM_USER is not set |
| 178 | # CONFIG_XFRM_SUB_POLICY is not set | 180 | # CONFIG_XFRM_SUB_POLICY is not set |
| 179 | CONFIG_NET_KEY=y | 181 | CONFIG_NET_KEY=y |
| 182 | CONFIG_IUCV=m | ||
| 183 | CONFIG_AFIUCV=m | ||
| 180 | CONFIG_INET=y | 184 | CONFIG_INET=y |
| 181 | CONFIG_IP_MULTICAST=y | 185 | CONFIG_IP_MULTICAST=y |
| 182 | # CONFIG_IP_ADVANCED_ROUTER is not set | 186 | # CONFIG_IP_ADVANCED_ROUTER is not set |
| @@ -431,7 +435,6 @@ CONFIG_TN3270_CONSOLE=y | |||
| 431 | CONFIG_TN3215=y | 435 | CONFIG_TN3215=y |
| 432 | CONFIG_TN3215_CONSOLE=y | 436 | CONFIG_TN3215_CONSOLE=y |
| 433 | CONFIG_CCW_CONSOLE=y | 437 | CONFIG_CCW_CONSOLE=y |
| 434 | CONFIG_SCLP=y | ||
| 435 | CONFIG_SCLP_TTY=y | 438 | CONFIG_SCLP_TTY=y |
| 436 | CONFIG_SCLP_CONSOLE=y | 439 | CONFIG_SCLP_CONSOLE=y |
| 437 | CONFIG_SCLP_VT220_TTY=y | 440 | CONFIG_SCLP_VT220_TTY=y |
| @@ -507,7 +510,6 @@ CONFIG_NET_ETHERNET=y | |||
| 507 | # | 510 | # |
| 508 | CONFIG_LCS=m | 511 | CONFIG_LCS=m |
| 509 | CONFIG_CTC=m | 512 | CONFIG_CTC=m |
| 510 | CONFIG_IUCV=m | ||
| 511 | # CONFIG_NETIUCV is not set | 513 | # CONFIG_NETIUCV is not set |
| 512 | # CONFIG_SMSGIUCV is not set | 514 | # CONFIG_SMSGIUCV is not set |
| 513 | # CONFIG_CLAW is not set | 515 | # CONFIG_CLAW is not set |
| @@ -724,9 +726,7 @@ CONFIG_CRYPTO_MANAGER=y | |||
| 724 | # CONFIG_CRYPTO_MD4 is not set | 726 | # CONFIG_CRYPTO_MD4 is not set |
| 725 | # CONFIG_CRYPTO_MD5 is not set | 727 | # CONFIG_CRYPTO_MD5 is not set |
| 726 | # CONFIG_CRYPTO_SHA1 is not set | 728 | # CONFIG_CRYPTO_SHA1 is not set |
| 727 | # CONFIG_CRYPTO_SHA1_S390 is not set | ||
| 728 | # CONFIG_CRYPTO_SHA256 is not set | 729 | # CONFIG_CRYPTO_SHA256 is not set |
| 729 | # CONFIG_CRYPTO_SHA256_S390 is not set | ||
| 730 | # CONFIG_CRYPTO_SHA512 is not set | 730 | # CONFIG_CRYPTO_SHA512 is not set |
| 731 | # CONFIG_CRYPTO_WP512 is not set | 731 | # CONFIG_CRYPTO_WP512 is not set |
| 732 | # CONFIG_CRYPTO_TGR192 is not set | 732 | # CONFIG_CRYPTO_TGR192 is not set |
| @@ -735,12 +735,10 @@ CONFIG_CRYPTO_ECB=m | |||
| 735 | CONFIG_CRYPTO_CBC=y | 735 | CONFIG_CRYPTO_CBC=y |
| 736 | # CONFIG_CRYPTO_LRW is not set | 736 | # CONFIG_CRYPTO_LRW is not set |
| 737 | # CONFIG_CRYPTO_DES is not set | 737 | # CONFIG_CRYPTO_DES is not set |
| 738 | # CONFIG_CRYPTO_DES_S390 is not set | ||
| 739 | # CONFIG_CRYPTO_BLOWFISH is not set | 738 | # CONFIG_CRYPTO_BLOWFISH is not set |
| 740 | # CONFIG_CRYPTO_TWOFISH is not set | 739 | # CONFIG_CRYPTO_TWOFISH is not set |
| 741 | # CONFIG_CRYPTO_SERPENT is not set | 740 | # CONFIG_CRYPTO_SERPENT is not set |
| 742 | # CONFIG_CRYPTO_AES is not set | 741 | # CONFIG_CRYPTO_AES is not set |
| 743 | # CONFIG_CRYPTO_AES_S390 is not set | ||
| 744 | # CONFIG_CRYPTO_CAST5 is not set | 742 | # CONFIG_CRYPTO_CAST5 is not set |
| 745 | # CONFIG_CRYPTO_CAST6 is not set | 743 | # CONFIG_CRYPTO_CAST6 is not set |
| 746 | # CONFIG_CRYPTO_TEA is not set | 744 | # CONFIG_CRYPTO_TEA is not set |
| @@ -755,6 +753,11 @@ CONFIG_CRYPTO_CBC=y | |||
| 755 | # | 753 | # |
| 756 | # Hardware crypto devices | 754 | # Hardware crypto devices |
| 757 | # | 755 | # |
| 756 | # CONFIG_CRYPTO_SHA1_S390 is not set | ||
| 757 | # CONFIG_CRYPTO_SHA256_S390 is not set | ||
| 758 | # CONFIG_CRYPTO_DES_S390 is not set | ||
| 759 | # CONFIG_CRYPTO_AES_S390 is not set | ||
| 760 | CONFIG_S390_PRNG=m | ||
| 758 | 761 | ||
| 759 | # | 762 | # |
| 760 | # Library routines | 763 | # Library routines |