summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/kvm_mmio.h
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-05-24 12:10:51 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-05-24 12:10:51 +0200
commit44bcc922381e24c4f38dc5dfd8d34d60b2ede898 (patch)
treee7d680d230ff534c8e1c20c9121f7c41feb034d9 /arch/arm/include/asm/kvm_mmio.h
parent9842df62004f366b9fed2423e24df10542ee0dc5 (diff)
parent35a2d58588f0992627e74b447ccab21570544c86 (diff)
downloadtalos-obmc-linux-44bcc922381e24c4f38dc5dfd8d34d60b2ede898.tar.gz
talos-obmc-linux-44bcc922381e24c4f38dc5dfd8d34d60b2ede898.zip
Merge tag 'kvm-arm-for-4-7-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next
KVM/ARM Changes for v4.7 take 2 "The GIC is dead; Long live the GIC" This set of changes include the new vgic, which is a reimplementation of our horribly broken legacy vgic implementation. The two implementations will live side-by-side (with the new being the configured default) for one kernel release and then we'll remove it. Also fixes a non-critical issue with virtual abort injection to guests.
Diffstat (limited to 'arch/arm/include/asm/kvm_mmio.h')
-rw-r--r--arch/arm/include/asm/kvm_mmio.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kvm_mmio.h b/arch/arm/include/asm/kvm_mmio.h
index d8e90c8cb5fa..f3a7de71f515 100644
--- a/arch/arm/include/asm/kvm_mmio.h
+++ b/arch/arm/include/asm/kvm_mmio.h
@@ -28,6 +28,9 @@ struct kvm_decode {
bool sign_extend;
};
+void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);
+unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);
+
int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);
int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
phys_addr_t fault_ipa);
OpenPOWER on IntegriCloud