Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d168f71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM ARM compile fixes from Gleb Natapov:
 "Fix ARM KVM compilation breakage due to changes from kvm.git"

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory_slot
  ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS
  ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region
parents 32dc43e4 3b8cd8a0

arch/arm/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <asm/kvm_arch_timer.h>



#define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS

#define KVM_MEMORY_SLOTS 32

#define KVM_USER_MEM_SLOTS 32

#define KVM_PRIVATE_MEM_SLOTS 4

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1

#define KVM_HAVE_ONE_REG

arch/arm/kvm/arm.c

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
				   struct kvm_memory_slot *memslot,

				   struct kvm_memory_slot old,

				   struct kvm_userspace_memory_region *mem,

				   int user_alloc)

				   bool user_alloc)

{

	return 0;

}
@@ -240,7 +240,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
void kvm_arch_commit_memory_region(struct kvm *kvm,

				   struct kvm_userspace_memory_region *mem,

				   struct kvm_memory_slot old,

				   int user_alloc)

				   bool user_alloc)

{

}

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)