Merge tag 'kvmarm-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm...

[linux.git] / virt / kvm / kvm_main.c

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5b064dbadaf420d6e568ac1da006e35b2326452c..e30f1b4ecfa5d1c3110bdbd36108aa417de008a9 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3409,10 +3409,8 @@ static int kvm_vcpu_check_block(struct kvm_vcpu *vcpu)
        int ret = -EINTR;
        int idx = srcu_read_lock(&vcpu->kvm->srcu);
 
-       if (kvm_arch_vcpu_runnable(vcpu)) {
-               kvm_make_request(KVM_REQ_UNHALT, vcpu);
+       if (kvm_arch_vcpu_runnable(vcpu))
                goto out;
-       }
        if (kvm_cpu_has_pending_timer(vcpu))
                goto out;
        if (signal_pending(current))
@@ -5888,7 +5886,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
 
        r = kvm_async_pf_init();
        if (r)
-               goto out_free_5;
+               goto out_free_4;
 
        kvm_chardev_ops.owner = module;
 
@@ -5912,10 +5910,9 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
 
 out_unreg:
        kvm_async_pf_deinit();
-out_free_5:
+out_free_4:
        for_each_possible_cpu(cpu)
                free_cpumask_var(per_cpu(cpu_kick_mask, cpu));
-out_free_4:
        kmem_cache_destroy(kvm_vcpu_cache);
 out_free_3:
        unregister_reboot_notifier(&kvm_reboot_notifier);