summaryrefslogtreecommitdiff
path: root/drivers/vfio
diff options
context:
space:
mode:
authorBharat Bhushan <Bharat.Bhushan@freescale.com>2014-02-11 05:51:09 (GMT)
committerJose Rivera <German.Rivera@freescale.com>2014-02-13 15:04:05 (GMT)
commit59c44b57e814f23a8e6f1e666a80deb57479730d (patch)
treeca27719a532155a02b7a01f576d0ad823e41e3fc /drivers/vfio
parentc76e828d42ba80d46cc2b1289076f96f9cd8d602 (diff)
downloadlinux-fsl-qoriq-59c44b57e814f23a8e6f1e666a80deb57479730d.tar.xz
vfio: using upstream defined stash attributes
This fixes below compilation error: drivers/vfio/vfio_iommu_fsl_pamu.c: In function 'vfio_handle_get_attr': drivers/vfio/vfio_iommu_fsl_pamu.c:622:32: error: storage size of 'stash' isn't known struct iommu_stash_attribute stash; ^ drivers/vfio/vfio_iommu_fsl_pamu.c:622:32: warning: unused variable 'stash' [-Wunused-variable] drivers/vfio/vfio_iommu_fsl_pamu.c: In function 'vfio_handle_set_attr': drivers/vfio/vfio_iommu_fsl_pamu.c:685:32: error: storage size of 'stash' isn't known struct iommu_stash_attribute stash; ^ drivers/vfio/vfio_iommu_fsl_pamu.c:685:32: warning: unused variable 'stash' [-Wunused-variable] make[2]: *** [drivers/vfio/vfio_iommu_fsl_pamu.o] Error 1 make[1]: *** [drivers/vfio] Error 2 Signed-off-by: Bharat Bhushan <Bharat.Bhushan@freescale.com> Change-Id: I5ab6b54ef32748f8099cb7b9a434fb607672ceba Reviewed-on: http://git.am.freescale.net:8181/8700 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Scott Wood <scottwood@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'drivers/vfio')
-rw-r--r--drivers/vfio/vfio_iommu_fsl_pamu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/vfio/vfio_iommu_fsl_pamu.c b/drivers/vfio/vfio_iommu_fsl_pamu.c
index 86faf72..2672e15 100644
--- a/drivers/vfio/vfio_iommu_fsl_pamu.c
+++ b/drivers/vfio/vfio_iommu_fsl_pamu.c
@@ -49,6 +49,7 @@
#include <linux/workqueue.h>
#include <linux/hugetlb.h>
#include <linux/msi.h>
+#include <asm/fsl_pamu_stash.h>
#define DRIVER_VERSION "0.1"
#define DRIVER_AUTHOR "Bharat Bhushan <bharat.bhushan@freescale.com>"
@@ -619,7 +620,7 @@ static int vfio_handle_get_attr(struct vfio_iommu *iommu,
break;
}
case VFIO_ATTR_PAMU_STASH: {
- struct iommu_stash_attribute stash;
+ struct pamu_stash_attribute stash;
if (iommu_domain_get_attr(iommu->domain,
DOMAIN_ATTR_FSL_PAMU_STASH, &stash)) {
pr_err("%s Error getting domain windows\n",
@@ -682,7 +683,7 @@ static int vfio_handle_set_attr(struct vfio_iommu *iommu,
break;
}
case VFIO_ATTR_PAMU_STASH: {
- struct iommu_stash_attribute stash;
+ struct pamu_stash_attribute stash;
stash.cpu = pamu_attr->attr_info.stash.cpu;
stash.cache = pamu_attr->attr_info.stash.cache;