With all infrastructure in place, lets provide dma_ops for virtio devices on s390. Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> --- drivers/s390/virtio/kvm_virtio.c | 2 ++ drivers/s390/virtio/virtio_ccw.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/s390/virtio/kvm_virtio.c b/drivers/s390/virtio/kvm_virtio.c index 53fb975..05adaa9 100644 --- a/drivers/s390/virtio/kvm_virtio.c +++ b/drivers/s390/virtio/kvm_virtio.c @@ -13,6 +13,7 @@ #include <linux/kernel_stat.h> #include <linux/init.h> #include <linux/bootmem.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/virtio.h> #include <linux/virtio_config.h> @@ -318,6 +319,7 @@ static void add_kvm_device(struct kvm_device_desc *d, unsigned int offset) return; } + kdev->vdev.dev.archdata.dma_ops = &dma_noop_ops; kdev->vdev.dev.parent = kvm_root; kdev->vdev.id.device = d->type; kdev->vdev.config = &kvm_vq_configspace_ops; diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c index 1cda784..8fb7a6b 100644 --- a/drivers/s390/virtio/virtio_ccw.c +++ b/drivers/s390/virtio/virtio_ccw.c @@ -13,6 +13,7 @@ #include <linux/kernel_stat.h> #include <linux/init.h> #include <linux/bootmem.h> +#include <linux/dma-mapping.h> #include <linux/err.h> #include <linux/virtio.h> #include <linux/virtio_config.h> @@ -1093,6 +1094,7 @@ static void virtio_ccw_auto_online(void *data, async_cookie_t cookie) struct ccw_device *cdev = data; int ret; + cdev->dev.archdata.dma_ops = &dma_noop_ops; ret = ccw_device_set_online(cdev); if (ret) dev_warn(&cdev->dev, "Failed to set online: %d\n", ret); -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
