s390/pci: extract software counters from fmb

The software counters are not a part of the function measurement
block. Also we do not check for zdev->fmb != NULL when using these
counters (function measurement can be toggled at runtime). Just move
the software counters to struct zpci_dev.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index ef803c202d42..d318e38dcb83 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -44,10 +44,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 {
@@ -111,6 +107,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;