diff options
| author | Gavin Shan | 2012-08-24 10:50:28 +0200 |
|---|---|---|
| committer | Marcelo Tosatti | 2012-08-27 21:44:20 +0200 |
| commit | 66a03505a7fcc70187319ef2318832f4d3c451a6 (patch) | |
| tree | 5d6b87ef9094fb11f9825b4702b29472496dafc5 /include/linux/kvm_host.h | |
| parent | Merge remote-tracking branch 'upstream/master' into queue (diff) | |
| download | kernel-qcow2-linux-66a03505a7fcc70187319ef2318832f4d3c451a6.tar.gz kernel-qcow2-linux-66a03505a7fcc70187319ef2318832f4d3c451a6.tar.xz kernel-qcow2-linux-66a03505a7fcc70187319ef2318832f4d3c451a6.zip | |
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 'include/linux/kvm_host.h')
| -rw-r--r-- | include/linux/kvm_host.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 5972c9845ddb..9c0b3c3ae0a5 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -773,6 +773,12 @@ __gfn_to_memslot(struct kvm_memslots *slots, gfn_t gfn) return search_memslots(slots, gfn); } +static inline 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 inline int memslot_id(struct kvm *kvm, gfn_t gfn) { return gfn_to_memslot(kvm, gfn)->id; |