drop virtio 4.9 patch

diff --git a/queue-4.9/series b/queue-4.9/series
index bc145ee4da0c7919f62555daadea28811982a978..39bce5b317deb1272b4af29564bab73093dd555f 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -52,7 +52,6 @@ genirq-release-resources-in-__setup_irq-error-path.patch
 alarmtimer-prevent-overflow-of-relative-timers.patch
 usb-gadget-composite-fix-function-used-to-free-memory.patch
 usb-dwc3-exynos-fix-axius-clock-error-path-to-do-cleanup.patch
-virtio_balloon-disable-viommu-support.patch
 mips-fix-bnezc-jialc-return-address-calculation.patch
 mips-.its-targets-depend-on-vmlinux.patch
 vtpm-fix-missing-null-check.patch

diff --git a/queue-4.9/virtio_balloon-disable-viommu-support.patch b/queue-4.9/virtio_balloon-disable-viommu-support.patch
deleted file mode 100644 (file)
index 9939262..0000000
--- a/queue-4.9/virtio_balloon-disable-viommu-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e41b1355508debe45fda33ef8c03ff3ba5d206b9 Mon Sep 17 00:00:00 2001
-From: "Michael S. Tsirkin" <mst@redhat.com>
-Date: Tue, 13 Jun 2017 20:56:44 +0300
-Subject: virtio_balloon: disable VIOMMU support
-
-From: Michael S. Tsirkin <mst@redhat.com>
-
-commit e41b1355508debe45fda33ef8c03ff3ba5d206b9 upstream.
-
-virtio balloon bypasses the DMA API entirely so does not support the
-VIOMMU right now.  It's not clear we need that support, for now let's
-just make sure we don't pretend to support it.
-
-Cc: Wei Wang <wei.w.wang@intel.com>
-Fixes: 1a937693993f ("virtio: new feature to detect IOMMU device quirk")
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Acked-by: Jason Wang <jasowang@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/virtio/virtio_balloon.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/virtio/virtio_balloon.c
-+++ b/drivers/virtio/virtio_balloon.c
-@@ -657,6 +657,12 @@ static int virtballoon_restore(struct vi
- }
- #endif
- 
-+static int virtballoon_validate(struct virtio_device *vdev)
-+{
-+      __virtio_clear_bit(vdev, VIRTIO_F_IOMMU_PLATFORM);
-+      return 0;
-+}
-+
- static unsigned int features[] = {
-       VIRTIO_BALLOON_F_MUST_TELL_HOST,
-       VIRTIO_BALLOON_F_STATS_VQ,
-@@ -669,6 +675,7 @@ static struct virtio_driver virtio_ballo
-       .driver.name =  KBUILD_MODNAME,
-       .driver.owner = THIS_MODULE,
-       .id_table =     id_table,
-+      .validate =     virtballoon_validate,
-       .probe =        virtballoon_probe,
-       .remove =       virtballoon_remove,
-       .config_changed = virtballoon_changed,