diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2014-06-11 11:04:20 -0700 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-06-11 10:13:30 +0200 |
| commit | 8122574c216608ae1d5388303336c4d792bc3841 (patch) | |
| tree | 45205ef95cdca11182c7fe00e39fc291ef55f8ab /arch/s390/configs/performance_defconfig | |
| parent | ef283688f54cc87c421f2a05ddf75fded6f4ad86 (diff) | |
| download | linux-8122574c216608ae1d5388303336c4d792bc3841.tar.gz linux-8122574c216608ae1d5388303336c4d792bc3841.tar.bz2 linux-8122574c216608ae1d5388303336c4d792bc3841.zip | |
s390: update default configuration
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/configs/performance_defconfig')
| -rw-r--r-- | arch/s390/configs/performance_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/configs/performance_defconfig b/arch/s390/configs/performance_defconfig index 54ebb85a7e57..d279baa08014 100644 --- a/arch/s390/configs/performance_defconfig +++ b/arch/s390/configs/performance_defconfig @@ -43,7 +43,8 @@ CONFIG_SOLARIS_X86_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_DEFAULT_DEADLINE=y -CONFIG_MARCH_Z9_109=y +CONFIG_MARCH_Z196=y +CONFIG_TUNE_ZEC12=y CONFIG_NR_CPUS=256 CONFIG_HZ_100=y CONFIG_MEMORY_HOTPLUG=y @@ -236,7 +237,6 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_CONNTRACK_IPV4=m # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_CHAIN_ROUTE_IPV4=m CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NF_TABLES_ARP=m |