projects/linux·commit 056537c6

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

056537c6 · Linus Torvalds <[email protected]> · 2015-06-08 16:26:53 -07:00

Pull last-minute virtio fix from Michael Tsirkin:
 "This fixes a minor issue affecting multiqueue virtio net when user
  keeps changing the number of active queues and CPUs are added and
  removed by hotplug"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_pci: Clear stale cpumask when setting irq affinity
Commit
056537c686e1eb8331ece43dff252903a7911dd0
Parents
40b985fb · 210d150e

Merge commit. Changes below are compared with the first parent: 40b985fb.

Changes

1 files changed · +1 −0

FileStatusAddDelContent
drivers/virtio/virtio_pci_common.cmodified+1−0View file

drivers/virtio/virtio_pci_common.c

View file
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index e894eb2..eba1b7a 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -423,6 +423,7 @@ int vp_set_vq_affinity(struct virtqueue *vq, int cpu)
if (cpu == -1)
irq_set_affinity_hint(irq, NULL);
else {
+ cpumask_clear(mask);
cpumask_set_cpu(cpu, mask);
irq_set_affinity_hint(irq, mask);
}