ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot
authorMarc Zyngier <marc.zyngier@arm.com>
Fri, 15 Feb 2013 19:20:08 +0000 (19:20 +0000)
committerGleb Natapov <gleb@redhat.com>
Mon, 25 Feb 2013 09:48:41 +0000 (11:48 +0200)
Commit 7a905b1 (KVM: Remove user_alloc from struct kvm_memory_slot)
broke KVM/ARM by removing the user_alloc field from a public structure.

As we only used this field to alert the user that we didn't support
this operation mode, there is no harm in discarding this bit of code
without any remorse.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
arch/arm/kvm/mmu.c

index f30e13163a9637076b4c2e91989bad1ed665f2ed..99e07c7dd7451fac2dfd4e3e2ea80f6f3c3f236a 100644 (file)
@@ -633,11 +633,6 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
        }
 
        memslot = gfn_to_memslot(vcpu->kvm, gfn);
-       if (!memslot->user_alloc) {
-               kvm_err("non user-alloc memslots not supported\n");
-               ret = -EINVAL;
-               goto out_unlock;
-       }
 
        ret = user_mem_abort(vcpu, fault_ipa, gfn, memslot, fault_status);
        if (ret == 0)