path: root/virt/kvm/eventfd.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 11:33:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 11:33:04 -0700
commit7bc30c23c8ace3821a6732bfbe7e8f1b0995a63e (patch)
tree3440c323f331fb2c0b5e84c206b3c73d70826ee6 /virt/kvm/eventfd.c
parentccfeef0ff76ebd632ae51bc56700f0072c4f1864 (diff)
parentbd22f5cfcfe8f68bf43b72daf4530cd7eedc9b7a (diff)
Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: move and fix substitue search for missing CPUID entries KVM: fix XSAVE bit scanning KVM: Enable async page fault processing KVM: fix crash on irqfd deassign
Diffstat (limited to 'virt/kvm/eventfd.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 36d8092dbb3f..73358d256fa2 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -90,7 +90,7 @@ irqfd_shutdown(struct work_struct *work)
* We know no new events will be scheduled at this point, so block
* until all previously outstanding events have completed
- flush_work(&irqfd->inject);
+ flush_work_sync(&irqfd->inject);
* It is now safe to release the object's resources