Commit 4a1cc2e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull two s390 bug fixes from Martin Schwidefsky:
 "Two changes, the first is a fix to add a missing memory clobber to the
  inline assembly to load control registers. This has not caused any
  issues so far, but who knows what code gcc will generate in future
  versions.

  The second change is an update for the default configurations. This
  includes CONFIG_BUG_ON_DATA_CORRUPTION=y, we want this to be enabled
  for s390. The usual approach to debug problems on production systems
  is to use crash on a system dump and for us avoiding data corruptions
  is priority one"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  s390/ctl_reg: make __ctl_load a full memory barrier
parents 08667577 1d999577

arch/s390/configs/default_defconfig

+13 −14
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ CONFIG_CMA=y 
CONFIG_CMA_DEBUG=y

CONFIG_CMA_DEBUGFS=y

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZPOOL=m

CONFIG_ZSWAP=y

CONFIG_ZBUD=m

CONFIG_ZSMALLOC=m

CONFIG_ZSMALLOC_STAT=y
@@ -141,8 +141,6 @@ CONFIG_NF_CONNTRACK_SECMARK=y 
CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y

CONFIG_NF_CONNTRACK_TIMESTAMP=y

CONFIG_NF_CT_PROTO_DCCP=m

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m
@@ -159,13 +157,12 @@ CONFIG_NF_TABLES=m 
CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_AUDIT=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
@@ -219,7 +216,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m 
CONFIG_NETFILTER_XT_MATCH_RATEEST=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_RECENT=m

CONFIG_NETFILTER_XT_MATCH_SOCKET=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

CONFIG_NETFILTER_XT_MATCH_STATISTIC=m

CONFIG_NETFILTER_XT_MATCH_STRING=m
@@ -258,7 +254,6 @@ CONFIG_IP_VS_NQ=m 
CONFIG_IP_VS_FTP=m

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_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m
@@ -436,7 +431,6 @@ CONFIG_EQUALIZER=m 
CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_TUN=m

CONFIG_VETH=m
@@ -480,6 +474,7 @@ CONFIG_VIRTIO_BALLOON=m 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y
@@ -592,14 +587,12 @@ CONFIG_LOCK_STAT=y 
CONFIG_DEBUG_LOCKDEP=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_LOCKING_API_SELFTESTS=y

CONFIG_DEBUG_LIST=y

CONFIG_DEBUG_SG=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_DEBUG_CREDENTIALS=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=300

CONFIG_NOTIFIER_ERROR_INJECTION=m

CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_PM_NOTIFIER_ERROR_INJECT=m

CONFIG_FAULT_INJECTION=y

CONFIG_FAILSLAB=y
@@ -618,6 +611,7 @@ CONFIG_STACK_TRACER=y 
CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENT=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_LKDTM=m

CONFIG_TEST_LIST_SORT=y
@@ -630,6 +624,7 @@ CONFIG_TEST_STRING_HELPERS=y 
CONFIG_TEST_KSTRTOX=y

CONFIG_DMA_API_DEBUG=y

CONFIG_TEST_BPF=m

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_S390_PTDUMP=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y
@@ -640,16 +635,18 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 
CONFIG_SECURITY_SELINUX_DISABLE=y

CONFIG_IMA=y

CONFIG_IMA_APPRAISE=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m
@@ -673,11 +670,13 @@ CONFIG_CRYPTO_SEED=m 
CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_LZO=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

arch/s390/configs/gcov_defconfig

+30 −20
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ CONFIG_TASK_IO_ACCOUNTING=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NUMA_BALANCING=y

# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y
@@ -54,8 +55,9 @@ CONFIG_SOLARIS_X86_PARTITION=y 
CONFIG_UNIXWARE_DISKLABEL=y

CONFIG_CFQ_GROUP_IOSCHED=y

CONFIG_DEFAULT_DEADLINE=y

CONFIG_LIVEPATCH=y

CONFIG_TUNE_ZEC12=y

CONFIG_NR_CPUS=256

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

CONFIG_HZ_100=y

CONFIG_MEMORY_HOTPLUG=y
@@ -65,6 +67,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y 
CONFIG_CLEANCACHE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA=y

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZBUD=m

CONFIG_ZSMALLOC=m
@@ -136,8 +139,6 @@ CONFIG_NF_CONNTRACK_SECMARK=y 
CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y

CONFIG_NF_CONNTRACK_TIMESTAMP=y

CONFIG_NF_CT_PROTO_DCCP=m

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m
@@ -154,13 +155,12 @@ CONFIG_NF_TABLES=m 
CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_AUDIT=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
@@ -214,7 +214,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m 
CONFIG_NETFILTER_XT_MATCH_RATEEST=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_RECENT=m

CONFIG_NETFILTER_XT_MATCH_SOCKET=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

CONFIG_NETFILTER_XT_MATCH_STATISTIC=m

CONFIG_NETFILTER_XT_MATCH_STRING=m
@@ -253,7 +252,6 @@ CONFIG_IP_VS_NQ=m 
CONFIG_IP_VS_FTP=m

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_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m
@@ -430,7 +428,6 @@ CONFIG_EQUALIZER=m 
CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_TUN=m

CONFIG_VETH=m
@@ -460,6 +457,7 @@ CONFIG_HW_RANDOM_VIRTIO=m 
CONFIG_RAW_DRIVER=m

CONFIG_HANGCHECK_TIMER=m

CONFIG_TN3270_FS=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m
@@ -473,6 +471,7 @@ CONFIG_VIRTIO_BALLOON=m 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y
@@ -495,6 +494,7 @@ CONFIG_AUTOFS4_FS=m 
CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_OVERLAY_FS=m

CONFIG_OVERLAY_FS_REDIRECT_DIR=y

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_ISO9660_FS=y
@@ -551,25 +551,27 @@ CONFIG_FRAME_WARN=1024 
CONFIG_UNUSED_SYMBOLS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m

CONFIG_PANIC_ON_OOPS=y

CONFIG_TIMER_STATS=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_NOTIFIER_ERROR_INJECTION=m

CONFIG_CPU_NOTIFIER_ERROR_INJECT=m

CONFIG_PM_NOTIFIER_ERROR_INJECT=m

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

# CONFIG_KPROBE_EVENT is not set

CONFIG_UPROBE_EVENT=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_LKDTM=m

CONFIG_RBTREE_TEST=m

CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_S390_PTDUMP=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y
@@ -577,18 +579,25 @@ CONFIG_SECURITY_SELINUX=y 
CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

CONFIG_SECURITY_SELINUX_DISABLE=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_IMA=y

CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_PCRYPT=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m
@@ -598,6 +607,7 @@ CONFIG_CRYPTO_RMD160=m 
CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m
@@ -612,10 +622,13 @@ CONFIG_CRYPTO_SEED=m 
CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m
@@ -624,9 +637,6 @@ CONFIG_CRYPTO_DES_S390=m 
CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m

CONFIG_X509_CERTIFICATE_PARSER=m

CONFIG_CRC7=m

CONFIG_CRC8=m

CONFIG_CORDIC=m

arch/s390/configs/performance_defconfig

+21 −12
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ CONFIG_TRANSPARENT_HUGEPAGE=y 
CONFIG_CLEANCACHE=y

CONFIG_FRONTSWAP=y

CONFIG_CMA=y

CONFIG_MEM_SOFT_DIRTY=y

CONFIG_ZSWAP=y

CONFIG_ZBUD=m

CONFIG_ZSMALLOC=m
@@ -136,8 +137,6 @@ CONFIG_NF_CONNTRACK_SECMARK=y 
CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y

CONFIG_NF_CONNTRACK_TIMESTAMP=y

CONFIG_NF_CT_PROTO_DCCP=m

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m
@@ -154,13 +153,12 @@ CONFIG_NF_TABLES=m 
CONFIG_NFT_EXTHDR=m

CONFIG_NFT_META=m

CONFIG_NFT_CT=m

CONFIG_NFT_RBTREE=m

CONFIG_NFT_HASH=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m

CONFIG_NFT_NAT=m

CONFIG_NFT_COMPAT=m

CONFIG_NFT_HASH=m

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_AUDIT=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
@@ -214,7 +212,6 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m 
CONFIG_NETFILTER_XT_MATCH_RATEEST=m

CONFIG_NETFILTER_XT_MATCH_REALM=m

CONFIG_NETFILTER_XT_MATCH_RECENT=m

CONFIG_NETFILTER_XT_MATCH_SOCKET=m

CONFIG_NETFILTER_XT_MATCH_STATE=m

CONFIG_NETFILTER_XT_MATCH_STATISTIC=m

CONFIG_NETFILTER_XT_MATCH_STRING=m
@@ -253,7 +250,6 @@ CONFIG_IP_VS_NQ=m 
CONFIG_IP_VS_FTP=m

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_CHAIN_ROUTE_IPV4=m

CONFIG_NF_TABLES_ARP=m
@@ -430,7 +426,6 @@ CONFIG_EQUALIZER=m 
CONFIG_IFB=m

CONFIG_MACVLAN=m

CONFIG_MACVTAP=m

CONFIG_IPVLAN=m

CONFIG_VXLAN=m

CONFIG_TUN=m

CONFIG_VETH=m
@@ -474,6 +469,7 @@ CONFIG_VIRTIO_BALLOON=m 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_EXT4_ENCRYPTION=y

CONFIG_JBD2_DEBUG=y

CONFIG_JFS_FS=m

CONFIG_JFS_POSIX_ACL=y
@@ -496,6 +492,7 @@ CONFIG_AUTOFS4_FS=m 
CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_OVERLAY_FS=m

CONFIG_OVERLAY_FS_REDIRECT_DIR=y

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m

CONFIG_ISO9660_FS=y
@@ -563,12 +560,16 @@ CONFIG_STACK_TRACER=y 
CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENT=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_LKDTM=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_S390_PTDUMP=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y
@@ -576,18 +577,25 @@ CONFIG_SECURITY_SELINUX=y 
CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

CONFIG_SECURITY_SELINUX_DISABLE=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_IMA=y

CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_PCRYPT=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m
@@ -597,6 +605,7 @@ CONFIG_CRYPTO_RMD160=m 
CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_ANUBIS=m
@@ -611,10 +620,13 @@ CONFIG_CRYPTO_SEED=m 
CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TEA=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m
@@ -623,9 +635,6 @@ CONFIG_CRYPTO_DES_S390=m 
CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m

CONFIG_X509_CERTIFICATE_PARSER=m

CONFIG_CRC7=m

CONFIG_CRC8=m

CONFIG_CORDIC=m

arch/s390/defconfig

+3 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_JUMP_LABEL=y 
CONFIG_STATIC_KEYS_SELFTEST=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y
@@ -130,8 +129,11 @@ CONFIG_DUMMY=m 
CONFIG_EQUALIZER=m

CONFIG_TUN=m

CONFIG_VIRTIO_NET=y

# CONFIG_NET_VENDOR_ALACRITECH is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

CONFIG_DEVKMEM=y

CONFIG_RAW_DRIVER=m

CONFIG_VIRTIO_BALLOON=y

CONFIG_EXT4_FS=y
@@ -183,7 +185,6 @@ CONFIG_TRACE_ENUM_MAP_FILE=y 
CONFIG_KPROBES_SANITY_TEST=y

CONFIG_S390_PTDUMP=y

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_AUTHENC=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m

arch/s390/include/asm/ctl_reg.h

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
	BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\

	asm volatile(							\

		"	lctlg	%1,%2,%0\n"				\

		: : "Q" (*(addrtype *)(&array)), "i" (low), "i" (high));\

		:							\

		: "Q" (*(addrtype *)(&array)), "i" (low), "i" (high)	\

		: "memory");						\

}



#define __ctl_store(array, low, high) {					\

CRA Git | Maintained and supported by SUSTech CRA and CCSE