2 files changed, 5 insertions, 4 deletions

diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 356965c9d107..9718e98d6d2a 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -171,7 +171,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_sync(&irqfd->inject);
+        flush_work(&irqfd->inject);
 
         if (irqfd->resampler) {
                 irqfd_resampler_shutdown(irqfd);
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index cc3f6dc506e4..c353b4599cec 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2105,9 +2105,10 @@ static long kvm_vcpu_compat_ioctl(struct file *filp,
                         if (copy_from_user(&csigset, sigmask_arg->sigset,
                                            sizeof csigset))
                                 goto out;
-                }
-                sigset_from_compat(&sigset, &csigset);
-                r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset);
+                        sigset_from_compat(&sigset, &csigset);
+                        r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset);
+                } else
+                        r = kvm_vcpu_ioctl_set_sigmask(vcpu, NULL);
                 break;
         }
         default: