diff options
Diffstat (limited to 'arch/s390/include/asm/pci.h')
| -rw-r--r-- | arch/s390/include/asm/pci.h | 10 | 
1 files changed, 6 insertions, 4 deletions
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;  |