diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-08 16:26:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-08 16:26:53 -0700 |
commit | 056537c686e1eb8331ece43dff252903a7911dd0 (patch) | |
tree | 13b687fff16dda6ca7e6e261cd717b837287eab4 /drivers | |
parent | 40b985fbe9bca5b06d34c30af4b89c2fdbe72d49 (diff) | |
parent | 210d150e1f5da506875e376422ba31ead2d49621 (diff) | |
download | linux-stable-056537c686e1eb8331ece43dff252903a7911dd0.tar.gz linux-stable-056537c686e1eb8331ece43dff252903a7911dd0.tar.bz2 linux-stable-056537c686e1eb8331ece43dff252903a7911dd0.zip |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
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
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/virtio/virtio_pci_common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c index e894eb278d83..eba1b7ac7294 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); } |