Commit 3b8cd8a0 authored Feb 15, 2013 by Marc Zyngier Committed by Gleb Natapov Feb 25, 2013

ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot



Commit 7a905b14 (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>

parent 2b5e1e47

arch/arm/kvm/mmu.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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)

Admin message