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

diff --combined virt/kvm/eventfd.c
index 36d8092dbb3f23981ae1932d0ab46e0e5ff06a20,0d1fd5160adff73af128eb704996b3480083a685..73358d256fa2d0e1dca075f0947fc187faf5089d
--- 1/virt/kvm/eventfd.c
--- 2/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@@ -90,7 -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
@@@ -578,7 -578,7 +578,7 @@@ kvm_assign_ioeventfd(struct kvm *kvm, s
  
        mutex_lock(&kvm->slots_lock);
  
 -      /* Verify that there isnt a match already */
 +      /* Verify that there isn't a match already */
        if (ioeventfd_check_collision(kvm, p)) {
                ret = -EEXIST;
                goto unlock_fail;