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

[linux-2.6-microblaze.git] / arch / arm64 / kvm / arm.c

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 98f05bd..691d21e 100644 (file)
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -254,6 +254,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
        vcpu->arch.target = -1;
        bitmap_zero(vcpu->arch.features, KVM_VCPU_MAX_FEATURES);
 
+       vcpu->arch.mmu_page_cache.gfp_zero = __GFP_ZERO;
+
        /* Set up the timer */
        kvm_timer_vcpu_init(vcpu);
 
@@ -647,7 +649,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
                return ret;
 
        if (run->exit_reason == KVM_EXIT_MMIO) {
-               ret = kvm_handle_mmio_return(vcpu, run);
+               ret = kvm_handle_mmio_return(vcpu);
                if (ret)
                        return ret;
        }
@@ -795,11 +797,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
                trace_kvm_exit(ret, kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu));
 
                /* Exit types that need handling before we can be preempted */
-               handle_exit_early(vcpu, run, ret);
+               handle_exit_early(vcpu, ret);
 
                preempt_enable();
 
-               ret = handle_exit(vcpu, run, ret);
+               ret = handle_exit(vcpu, ret);
        }
 
        /* Tell userspace about in-kernel device output levels */