summaryrefslogtreecommitdiff
path: root/include/kvm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2018-03-19 20:43:01 +0300
committerMarc Zyngier <marc.zyngier@arm.com>2018-03-19 20:43:01 +0300
commit5fbb0df6f68e31a586b947433e93ba9654c8080f (patch)
tree65e68ad352e17318d009e5f69bde535c79b8c3e7 /include/kvm
parent4b472ffd1513407ee3607b8e638e8695e9b487ca (diff)
parent27e91ad1e746e341ca2312f29bccb9736be7b476 (diff)
downloadlinux-5fbb0df6f68e31a586b947433e93ba9654c8080f.tar.xz
Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD
Resolve conflicts with current mainline
Diffstat (limited to 'include/kvm')
-rw-r--r--include/kvm/arm_vgic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 87d2ad0a4292..24f03941ada8 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -358,6 +358,7 @@ void kvm_vgic_put(struct kvm_vcpu *vcpu);
bool kvm_vcpu_has_pending_irqs(struct kvm_vcpu *vcpu);
void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu);
void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu);
+void kvm_vgic_reset_mapped_irq(struct kvm_vcpu *vcpu, u32 vintid);
void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg);