Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8122574c authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: update default configuration 



Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent ef283688

arch/s390/configs/default_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,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_PREEMPT=y

CONFIG_HZ_100=y
@@ -240,7 +241,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

arch/s390/configs/gcov_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,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
@@ -238,7 +239,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

arch/s390/configs/performance_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/s390/configs/zfcpdump_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_DEFAULT_DEADLINE=y

CONFIG_MARCH_Z9_109=y

CONFIG_MARCH_Z196=y

CONFIG_TUNE_ZEC12=y

# CONFIG_COMPAT is not set

CONFIG_NR_CPUS=2

# CONFIG_HOTPLUG_CPU is not set

arch/s390/defconfig

+7 −1
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ CONFIG_PROVE_LOCKING=y 
CONFIG_LOCK_STAT=y

CONFIG_DEBUG_LOCKDEP=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_WRITECOUNT=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_PI_LIST=y

CONFIG_DEBUG_SG=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_PROVE_RCU=y
@@ -199,4 +199,10 @@ CONFIG_CRYPTO_SHA512_S390=m 
CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRC7=m

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_ARM is not set

# CONFIG_XZ_DEC_ARMTHUMB is not set

# CONFIG_XZ_DEC_SPARC is not set

CONFIG_CMM=m