Merge branch 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / virt / kvm / eventfd.c

diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 2ca4535f4fb76b2629986e29c6225e77febdd698..3656849f78a0b722236f25eefd58dac4fc839dcf 100644 (file)
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -313,8 +313,9 @@ kvm_irqfd_deassign(struct kvm *kvm, int fd, int gsi)
                if (irqfd->eventfd == eventfd && irqfd->gsi == gsi) {
                        /*
                         * This rcu_assign_pointer is needed for when
-                        * another thread calls kvm_irqfd_update before
-                        * we flush workqueue below.
+                        * another thread calls kvm_irq_routing_update before
+                        * we flush workqueue below (we synchronize with
+                        * kvm_irq_routing_update using irqfds.lock).
                         * It is paired with synchronize_rcu done by caller
                         * of that function.
                         */