diff mbox

[RFC,3/6] vfio: make vfio build on s390

Message ID 20140919115940.253423024@de.ibm.com
State New
Headers show

Commit Message

frank.blaschka@de.ibm.com Sept. 19, 2014, 11:54 a.m. UTC 
From: Frank Blaschka <frank.blaschka@de.ibm.com>

This patch adds some small changes to make vfio build on s390.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
 drivers/vfio/Kconfig             |    2 +-
 drivers/vfio/pci/vfio_pci_rdwr.c |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
diff mbox

Patch

--- a/drivers/vfio/Kconfig
+++ b/drivers/vfio/Kconfig
@@ -16,7 +16,7 @@  config VFIO_SPAPR_EEH
 menuconfig VFIO
 	tristate "VFIO Non-Privileged userspace driver framework"
 	depends on IOMMU_API
-	select VFIO_IOMMU_TYPE1 if X86
+	select VFIO_IOMMU_TYPE1 if (X86 || S390)
 	select VFIO_IOMMU_SPAPR_TCE if (PPC_POWERNV || PPC_PSERIES)
 	select VFIO_SPAPR_EEH if (PPC_POWERNV || PPC_PSERIES)
 	select ANON_INODES
--- a/drivers/vfio/pci/vfio_pci_rdwr.c
+++ b/drivers/vfio/pci/vfio_pci_rdwr.c
@@ -177,6 +177,13 @@  ssize_t vfio_pci_bar_rw(struct vfio_pci_
 	return done;
 }
 
+#ifdef CONFIG_NO_IOPORT_MAP
+ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf,
+			size_t count, loff_t *ppos, bool iswrite)
+{
+	return -EINVAL;
+}
+#else
 ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf,
 			       size_t count, loff_t *ppos, bool iswrite)
 {
@@ -236,3 +243,4 @@  ssize_t vfio_pci_vga_rw(struct vfio_pci_
 
 	return done;
 }
+#endif