diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-29 15:44:05 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-29 15:44:05 +0100 |
| commit | 7227fc0666606b0df2c0d2966a7f4859b01bdf74 (patch) | |
| tree | 2effa7ffe302b1ef917b29973cb5b3bc9343ce8b /arch/powerpc/include/asm/kvm_ppc.h | |
| parent | 6acdb1603a7db4c1b5d91863a13d2c3f1b9188b0 (diff) | |
| parent | 72cde5a88d37ba88ad1d47aecf957a9e528636d7 (diff) | |
| download | linux-next-7227fc0666606b0df2c0d2966a7f4859b01bdf74.tar.gz linux-next-7227fc0666606b0df2c0d2966a7f4859b01bdf74.zip | |
Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next
Diffstat (limited to 'arch/powerpc/include/asm/kvm_ppc.h')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_ppc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index fcd53f0d34ba..4096f16502a9 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -129,6 +129,8 @@ extern long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, struct kvm_create_spapr_tce *args); extern long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, unsigned long ioba, unsigned long tce); +extern long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn, + unsigned long ioba); extern struct kvm_rma_info *kvm_alloc_rma(void); extern void kvm_release_rma(struct kvm_rma_info *ri); extern struct page *kvm_alloc_hpt(unsigned long nr_pages); |