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

Pull more s390 updates from Martin Schwidefsky:
 "The big thing in this second merge for s390 is the new eBPF JIT from
  Michael which replaces the old 32-bit backend.

  The remaining commits are bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/pci: add locking for fmb access
  s390/pci: extract software counters from fmb
  s390/dasd: Fix unresumed device after suspend/resume having no paths
  s390/dasd: fix unresumed device after suspend/resume
  s390/dasd: fix inability to set a DASD device offline
  s390/mm: Fix memory hotplug for unaligned standby memory
  s390/bpf: Add s390x eBPF JIT compiler backend
  s390: Use bool function return values of true/false not 1/0

2 files changed, 7 insertions, 5 deletions

diff --git a/arch/s390/include/asm/dma-mapping.h b/arch/s390/include/asm/dma-mapping.h
index 709955ddaa4d..9d395961e713 100644
--- a/arch/s390/include/asm/dma-mapping.h
+++ b/arch/s390/include/asm/dma-mapping.h
@@ -42,7 +42,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
 static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
 {
         if (!dev->dma_mask)
-                return 0;
+                return false;
         return addr + size - 1 <= *dev->dma_mask;
 }
 
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index ef803c202d42..a648338c434a 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -7,6 +7,7 @@
 #define PCI_BAR_COUNT   6
 
 #include <linux/pci.h>
+#include <linux/mutex.h>
 #include <asm-generic/pci.h>
 #include <asm-generic/pci-dma-compat.h>
 #include <asm/pci_clp.h>
@@ -44,10 +45,6 @@ struct zpci_fmb {
         u64 rpcit_ops;
         u64 dma_rbytes;
         u64 dma_wbytes;
-        /* software counters */
-        atomic64_t allocated_pages;
-        atomic64_t mapped_pages;
-        atomic64_t unmapped_pages;
 } __packed __aligned(16);
 
 enum zpci_state {
@@ -80,6 +77,7 @@ struct zpci_dev {
         u8              pft;            /* pci function type */
         u16             domain;
 
+        struct mutex lock;
         u8 pfip[CLP_PFIP_NR_SEGMENTS];  /* pci function internal path */
         u32 uid;                        /* user defined id */
         u8 util_str[CLP_UTIL_STR_LEN];  /* utility string */
@@ -111,6 +109,10 @@ struct zpci_dev {
         /* Function measurement block */
         struct zpci_fmb *fmb;
         u16             fmb_update;     /* update interval */
+        /* software counters */
+        atomic64_t allocated_pages;
+        atomic64_t mapped_pages;
+        atomic64_t unmapped_pages;
 
         enum pci_bus_speed max_bus_speed;