From: Greg Kroah-Hartman Date: Mon, 19 Jun 2017 02:44:58 +0000 (+0800) Subject: drop virtio 4.9 patch X-Git-Tag: v4.11.7~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96ce85b3b5dbf5dd30b7d891b9dc8ba4171b00e3;p=thirdparty%2Fkernel%2Fstable-queue.git drop virtio 4.9 patch --- diff --git a/queue-4.9/series b/queue-4.9/series index bc145ee4da0..39bce5b317d 100644 --- 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 index 99392624582..00000000000 --- 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" -Date: Tue, 13 Jun 2017 20:56:44 +0300 -Subject: virtio_balloon: disable VIOMMU support - -From: Michael S. Tsirkin - -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 -Fixes: 1a937693993f ("virtio: new feature to detect IOMMU device quirk") -Signed-off-by: Michael S. Tsirkin -Acked-by: Jason Wang -Signed-off-by: Greg Kroah-Hartman - ---- - 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,