Commit bdbf57bc authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390: update defconfigs 



Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent c9305b6c

arch/s390/configs/debug_defconfig

+29 −24
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ CONFIG_CHECKPOINT_RESTORE=y 
CONFIG_SCHED_AUTOGROUP=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_LIVEPATCH=y

CONFIG_MARCH_ZEC12=y
@@ -74,6 +72,7 @@ CONFIG_MODULES=y 
CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SIG_SHA256=y
@@ -93,6 +92,10 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLUB_STATS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y
@@ -102,14 +105,12 @@ CONFIG_CMA_DEBUGFS=y 
CONFIG_CMA_SYSFS=y

CONFIG_CMA_AREAS=7

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_DEFERRED_STRUCT_PAGE_INIT=y

CONFIG_IDLE_PAGE_TRACKING=y

CONFIG_PERCPU_STATS=y

CONFIG_GUP_TEST=y

CONFIG_ANON_VMA_NAME=y

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -167,6 +168,7 @@ CONFIG_BRIDGE_NETFILTER=m 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_PROCFS=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y

CONFIG_NF_CONNTRACK_TIMESTAMP=y
@@ -493,7 +495,6 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_ASIX is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CADENCE is not set

# CONFIG_NET_VENDOR_CAVIUM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set
@@ -509,7 +510,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_WANGXUN is not set

# CONFIG_NET_VENDOR_LITEX is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m
@@ -518,16 +519,18 @@ CONFIG_MLX5_CORE_EN=y 
# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_MYRI is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETERION is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_VENDOR_PACKET_ENGINES is not set

# CONFIG_NET_VENDOR_PENSANDO is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_REALTEK is not set
@@ -535,9 +538,9 @@ CONFIG_MLX5_CORE_EN=y 
# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SILAN is not set

# CONFIG_NET_VENDOR_SIS is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_SOCIONEXT is not set

# CONFIG_NET_VENDOR_STMICRO is not set
@@ -570,6 +573,8 @@ CONFIG_VIRTIO_CONSOLE=m 
CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_HANGCHECK_TIMER=m

CONFIG_TN3270_FS=y

# CONFIG_RANDOM_TRUST_CPU is not set

# CONFIG_RANDOM_TRUST_BOOTLOADER is not set

CONFIG_PPS=m

# CONFIG_PTP_1588_CLOCK is not set

# CONFIG_HWMON is not set
@@ -727,18 +732,26 @@ CONFIG_CRYPTO_LRW=m 
CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_SHA3_256_S390=m

CONFIG_CRYPTO_SHA3_512_S390=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m
@@ -746,11 +759,14 @@ CONFIG_CRYPTO_CAMELLIA=m 
CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_CHACHA_S390=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_842=m
@@ -766,16 +782,6 @@ CONFIG_CRYPTO_STATS=y 
CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA3_256_S390=m

CONFIG_CRYPTO_SHA3_512_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_CHACHA_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_CORDIC=m

CONFIG_CRYPTO_LIB_CURVE25519=m
@@ -797,6 +803,7 @@ CONFIG_HEADERS_INSTALL=y 
CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_SLUB_DEBUG_ON=y

CONFIG_PAGE_OWNER=y

CONFIG_DEBUG_RODATA_TEST=y

CONFIG_DEBUG_WX=y
@@ -808,8 +815,6 @@ CONFIG_DEBUG_OBJECTS_TIMERS=y 
CONFIG_DEBUG_OBJECTS_WORK=y

CONFIG_DEBUG_OBJECTS_RCU_HEAD=y

CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y

CONFIG_SLUB_DEBUG_ON=y

CONFIG_SLUB_STATS=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_VM_PGFLAGS=y

arch/s390/configs/defconfig

+27 −22
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ CONFIG_CHECKPOINT_RESTORE=y 
CONFIG_SCHED_AUTOGROUP=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_LIVEPATCH=y

CONFIG_MARCH_ZEC12=y
@@ -69,6 +67,7 @@ CONFIG_MODULES=y 
CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SIG_SHA256=y
@@ -88,6 +87,9 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC_STAT=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y
@@ -95,13 +97,11 @@ CONFIG_TRANSPARENT_HUGEPAGE=y 
CONFIG_CMA_SYSFS=y

CONFIG_CMA_AREAS=7

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_DEFERRED_STRUCT_PAGE_INIT=y

CONFIG_IDLE_PAGE_TRACKING=y

CONFIG_PERCPU_STATS=y

CONFIG_ANON_VMA_NAME=y

CONFIG_USERFAULTFD=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=m
@@ -159,6 +159,7 @@ CONFIG_BRIDGE_NETFILTER=m 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_PROCFS=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y

CONFIG_NF_CONNTRACK_TIMESTAMP=y
@@ -484,7 +485,6 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_ASIX is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CADENCE is not set

# CONFIG_NET_VENDOR_CAVIUM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set
@@ -500,7 +500,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_WANGXUN is not set

# CONFIG_NET_VENDOR_LITEX is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m
@@ -509,16 +509,18 @@ CONFIG_MLX5_CORE_EN=y 
# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set

# CONFIG_NET_VENDOR_MICROSOFT is not set

# CONFIG_NET_VENDOR_MYRI is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_NETERION is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NI is not set

# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_VENDOR_PACKET_ENGINES is not set

# CONFIG_NET_VENDOR_PENSANDO is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_QUALCOMM is not set

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_REALTEK is not set
@@ -526,9 +528,9 @@ CONFIG_MLX5_CORE_EN=y 
# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SILAN is not set

# CONFIG_NET_VENDOR_SIS is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_SOCIONEXT is not set

# CONFIG_NET_VENDOR_STMICRO is not set
@@ -561,6 +563,8 @@ CONFIG_VIRTIO_CONSOLE=m 
CONFIG_HW_RANDOM_VIRTIO=m

CONFIG_HANGCHECK_TIMER=m

CONFIG_TN3270_FS=y

# CONFIG_RANDOM_TRUST_CPU is not set

# CONFIG_RANDOM_TRUST_BOOTLOADER is not set

# CONFIG_PTP_1588_CLOCK is not set

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y
@@ -713,18 +717,26 @@ CONFIG_CRYPTO_OFB=m 
CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_SHA3_256_S390=m

CONFIG_CRYPTO_SHA3_512_S390=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_BLOWFISH=m
@@ -732,11 +744,14 @@ CONFIG_CRYPTO_CAMELLIA=m 
CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_CHACHA_S390=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_842=m
@@ -752,16 +767,6 @@ CONFIG_CRYPTO_STATS=y 
CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_SHA3_256_S390=m

CONFIG_CRYPTO_SHA3_512_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_CHACHA_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_CORDIC=m

CONFIG_PRIME_NUMBERS=m

arch/s390/configs/zfcpdump_defconfig

+4 −2
Original line number Diff line number Diff line 
# CONFIG_SWAP is not set

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BPF_SYSCALL=y
@@ -9,7 +8,6 @@ CONFIG_BPF_SYSCALL=y 
# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MARCH_ZEC12=y

CONFIG_TUNE_ZEC12=y

# CONFIG_COMPAT is not set
@@ -28,6 +26,8 @@ CONFIG_CRASH_DUMP=y 
# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SWAP is not set

# CONFIG_COMPAT_BRK is not set

# CONFIG_COMPACTION is not set

# CONFIG_MIGRATION is not set

CONFIG_NET=y
@@ -53,10 +53,12 @@ CONFIG_ZFCP=y 
# CONFIG_HVC_IUCV is not set

# CONFIG_HW_RANDOM_S390 is not set

# CONFIG_HMC_DRV is not set

# CONFIG_S390_UV_UAPI is not set

# CONFIG_S390_TAPE is not set

# CONFIG_VMCP is not set

# CONFIG_MONWRITER is not set

# CONFIG_S390_VMUR is not set

# CONFIG_RANDOM_TRUST_BOOTLOADER is not set

# CONFIG_HID is not set

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set