Commit 6fe137cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Vasily Gorbik:

 - defconfig updates

 - Fix build errors with CC_OPTIMIZE_FOR_SIZE due to usage of "i"
   constraint for function arguments. Two kvm changes acked-by Christian
   Borntraeger.

 - Fix -Wunused-but-set-variable warnings in mm code.

 - Avoid a constant misuse in qdio.

 - Handle a case when cpumf is temporarily unavailable.

* tag 's390-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  KVM: s390: mark __insn32_query() as __always_inline
  KVM: s390: fix __insn32_query() inline assembly
  s390: update defconfigs
  s390/pci: mark function(s) __always_inline
  s390/mm: mark function(s) __always_inline
  s390/jump_label: mark function(s) __always_inline
  s390/cpu_mf: mark function(s) __always_inline
  s390/atomic,bitops: mark function(s) __always_inline
  s390/mm: fix -Wunused-but-set-variable warnings
  s390: mark __cpacf_query() as __always_inline
  s390/qdio: clarify size of the QIB parm area
  s390/cpumf: Fix indentation in sampling device driver
  s390/cpumsf: Check for CPU Measurement sampling
  s390/cpumf: Use consistant debug print format
parents 4ea65534 d0dea733

arch/s390/configs/debug_defconfig

+16 −8
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ CONFIG_NR_CPUS=512 
CONFIG_NUMA=y

CONFIG_HZ_100=y

CONFIG_KEXEC_FILE=y

CONFIG_KEXEC_SIG=y

CONFIG_EXPOLINE=y

CONFIG_EXPOLINE_AUTO=y

CONFIG_CHSC_SCH=y
@@ -69,12 +70,13 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_SHA256=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_CGROUP_IOLATENCY=y

CONFIG_BLK_CGROUP_IOCOST=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_BSD_DISKLABEL=y
@@ -370,6 +372,7 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

# CONFIG_NET_DROP_MONITOR is not set

CONFIG_PCI=y

CONFIG_PCI_DEBUG=y

CONFIG_HOTPLUG_PCI=y
@@ -424,6 +427,7 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_WRITECACHE=m

CONFIG_DM_CLONE=m

CONFIG_DM_MIRROR=m

CONFIG_DM_LOG_USERSPACE=m

CONFIG_DM_RAID=m
@@ -435,6 +439,7 @@ CONFIG_DM_DELAY=m 
CONFIG_DM_UEVENT=y

CONFIG_DM_FLAKEY=m

CONFIG_DM_VERITY=m

CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y

CONFIG_DM_SWITCH=m

CONFIG_NETDEVICES=y

CONFIG_BONDING=m
@@ -489,6 +494,7 @@ CONFIG_MLX5_CORE_EN=y 
# 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_QUALCOMM is not set

# CONFIG_NET_VENDOR_RDC is not set
@@ -538,15 +544,16 @@ CONFIG_WATCHDOG=y 
CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

CONFIG_DRM=y

CONFIG_DRM_VIRTIO_GPU=y

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_SYNC_FILE=y

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_VFIO_MDEV=m
@@ -580,6 +587,8 @@ CONFIG_NILFS2_FS=m 
CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y

CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -589,6 +598,7 @@ CONFIG_QFMT_V2=m 
CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_VIRTIO_FS=m

CONFIG_OVERLAY_FS=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m
@@ -648,12 +658,15 @@ CONFIG_FORTIFY_SOURCE=y 
CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_DISABLE=y

CONFIG_SECURITY_LOCKDOWN_LSM=y

CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_IMA=y

CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_PCRYPT=m
@@ -664,10 +677,6 @@ CONFIG_CRYPTO_ECDH=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m

CONFIG_CRYPTO_AEGIS256=m

CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m
@@ -739,7 +748,6 @@ CONFIG_DEBUG_INFO=y 
CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_GDB_SCRIPTS=y

CONFIG_FRAME_WARN=1024

CONFIG_UNUSED_SYMBOLS=y

CONFIG_HEADERS_INSTALL=y

CONFIG_HEADERS_CHECK=y

CONFIG_DEBUG_SECTION_MISMATCH=y

arch/s390/configs/defconfig

+16 −9
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ CONFIG_NUMA=y 
# CONFIG_NUMA_EMU is not set

CONFIG_HZ_100=y

CONFIG_KEXEC_FILE=y

CONFIG_KEXEC_SIG=y

CONFIG_EXPOLINE=y

CONFIG_EXPOLINE_AUTO=y

CONFIG_CHSC_SCH=y
@@ -66,11 +67,12 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_SHA256=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_CGROUP_IOLATENCY=y

CONFIG_BLK_CGROUP_IOCOST=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_BSD_DISKLABEL=y
@@ -363,6 +365,7 @@ CONFIG_NETLINK_DIAG=m 
CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

# CONFIG_NET_DROP_MONITOR is not set

CONFIG_PCI=y

CONFIG_HOTPLUG_PCI=y

CONFIG_HOTPLUG_PCI_S390=y
@@ -418,6 +421,7 @@ CONFIG_DM_CRYPT=m 
CONFIG_DM_SNAPSHOT=m

CONFIG_DM_THIN_PROVISIONING=m

CONFIG_DM_WRITECACHE=m

CONFIG_DM_CLONE=m

CONFIG_DM_MIRROR=m

CONFIG_DM_LOG_USERSPACE=m

CONFIG_DM_RAID=m
@@ -429,6 +433,7 @@ CONFIG_DM_DELAY=m 
CONFIG_DM_UEVENT=y

CONFIG_DM_FLAKEY=m

CONFIG_DM_VERITY=m

CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y

CONFIG_DM_SWITCH=m

CONFIG_DM_INTEGRITY=m

CONFIG_NETDEVICES=y
@@ -484,6 +489,7 @@ CONFIG_MLX5_CORE_EN=y 
# 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_QUALCOMM is not set

# CONFIG_NET_VENDOR_RDC is not set
@@ -533,16 +539,16 @@ CONFIG_WATCHDOG_CORE=y 
CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

CONFIG_DRM=y

CONFIG_DRM_VIRTIO_GPU=y

# CONFIG_BACKLIGHT_CLASS_DEVICE is not set

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_SYNC_FILE=y

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_VFIO_MDEV=m
@@ -573,6 +579,8 @@ CONFIG_NILFS2_FS=m 
CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y

CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -581,6 +589,7 @@ CONFIG_QFMT_V2=m 
CONFIG_AUTOFS4_FS=m

CONFIG_FUSE_FS=y

CONFIG_CUSE=m

CONFIG_VIRTIO_FS=m

CONFIG_OVERLAY_FS=m

CONFIG_FSCACHE=m

CONFIG_CACHEFILES=m
@@ -639,12 +648,15 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_DISABLE=y

CONFIG_SECURITY_LOCKDOWN_LSM=y

CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_IMA=y

CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"

CONFIG_CRYPTO_FIPS=y

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -656,10 +668,6 @@ CONFIG_CRYPTO_ECDH=m 
CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128L=m

CONFIG_CRYPTO_AEGIS256=m

CONFIG_CRYPTO_MORUS640=m

CONFIG_CRYPTO_MORUS1280=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m
@@ -727,7 +735,6 @@ CONFIG_DEBUG_INFO=y 
CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_GDB_SCRIPTS=y

CONFIG_FRAME_WARN=1024

CONFIG_UNUSED_SYMBOLS=y

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_MEMORY_INIT=y

arch/s390/configs/zfcpdump_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ CONFIG_RAW_DRIVER=y 
CONFIG_CONFIGFS_FS=y

# CONFIG_MISC_FILESYSTEMS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

# CONFIG_DIMLIB is not set

CONFIG_LSM="yama,loadpin,safesetid,integrity"

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

arch/s390/include/asm/atomic_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ __ATOMIC_OPS(__atomic64_xor, long, "laxg") 
#undef __ATOMIC_OP



#define __ATOMIC_CONST_OP(op_name, op_type, op_string, op_barrier)	\

static inline void op_name(op_type val, op_type *ptr)			\

static __always_inline void op_name(op_type val, op_type *ptr)		\

{									\

	asm volatile(							\

		op_string "	%[ptr],%[val]\n"			\

arch/s390/include/asm/bitops.h

+4 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ __bitops_byte(unsigned long nr, volatile unsigned long *ptr) 
	return ((unsigned char *)ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);

}



static inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr)

static __always_inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr)

{

	unsigned long *addr = __bitops_word(nr, ptr);

	unsigned long mask;
@@ -77,7 +77,7 @@ static inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr) 
	__atomic64_or(mask, (long *)addr);

}



static inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr)

static __always_inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr)

{

	unsigned long *addr = __bitops_word(nr, ptr);

	unsigned long mask;
@@ -98,7 +98,7 @@ static inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr) 
	__atomic64_and(mask, (long *)addr);

}



static inline void arch_change_bit(unsigned long nr,

static __always_inline void arch_change_bit(unsigned long nr,

					    volatile unsigned long *ptr)

{

	unsigned long *addr = __bitops_word(nr, ptr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE