path: root/virt/kvm
diff options
authorGavin Shan <shangw@linux.vnet.ibm.com>2012-08-24 16:50:28 +0800
committerMarcelo Tosatti <mtosatti@redhat.com>2012-08-27 16:44:20 -0300
commit66a03505a7fcc70187319ef2318832f4d3c451a6 (patch)
tree5d6b87ef9094fb11f9825b4702b29472496dafc5 /virt/kvm
parentc78aa4c4b94b5b148be576a9f1570e31fe282b46 (diff)
KVM: PPC: book3s: fix build error caused by gfn_to_hva_memslot()
The build error was caused by that builtin functions are calling the functions implemented in modules. This error was introduced by commit 4d8b81abc4 ("KVM: introduce readonly memslot"). The patch fixes the build error by moving function __gfn_to_hva_memslot() from kvm_main.c to kvm_host.h and making that "inline" so that the builtin function (kvmppc_h_enter) can use that. Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt/kvm')
1 files changed, 0 insertions, 6 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 3416f8a31f6..6425906d7ce 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -984,12 +984,6 @@ static bool memslot_is_readonly(struct kvm_memory_slot *slot)
return slot->flags & KVM_MEM_READONLY;
-static unsigned long __gfn_to_hva_memslot(struct kvm_memory_slot *slot,
- gfn_t gfn)
- return slot->userspace_addr + (gfn - slot->base_gfn) * PAGE_SIZE;
static unsigned long __gfn_to_hva_many(struct kvm_memory_slot *slot, gfn_t gfn,
gfn_t *nr_pages, bool write)