diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-15 19:20:08 +0000 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-02-25 11:48:41 +0200 |
| commit | 3b8cd8a015f3db85624c0fdb591956aed7f61b65 (patch) | |
| tree | 74d3bf6905f6c82e45ca19d180b9753b66fd5f49 | |
| parent | 2b5e1e474fd7b0f2540a052d15465ba953dd30b1 (diff) | |
| download | linux-3b8cd8a015f3db85624c0fdb591956aed7f61b65.tar.bz2 | |
ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot
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>
| -rw-r--r-- | arch/arm/kvm/mmu.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index f30e13163a96..99e07c7dd745 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -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) |