diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:33:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:33:04 -0400 |
| commit | 7bc30c23c8ace3821a6732bfbe7e8f1b0995a63e (patch) | |
| tree | 3440c323f331fb2c0b5e84c206b3c73d70826ee6 /virt/kvm/eventfd.c | |
| parent | ccfeef0ff76ebd632ae51bc56700f0072c4f1864 (diff) | |
| parent | bd22f5cfcfe8f68bf43b72daf4530cd7eedc9b7a (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')
| -rw-r--r-- | virt/kvm/eventfd.c | 2 |
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) | |||
| 90 | * We know no new events will be scheduled at this point, so block | 90 | * We know no new events will be scheduled at this point, so block |
| 91 | * until all previously outstanding events have completed | 91 | * until all previously outstanding events have completed |
| 92 | */ | 92 | */ |
| 93 | flush_work(&irqfd->inject); | 93 | flush_work_sync(&irqfd->inject); |
| 94 | 94 | ||
| 95 | /* | 95 | /* |
| 96 | * It is now safe to release the object's resources | 96 | * It is now safe to release the object's resources |