diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:25:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:25:26 +0100 |
| commit | ea2301b6220117398a1de4f4bc853fbe886d5e08 (patch) | |
| tree | 8823c3becd0b4fd3db9706892845cd02f760627a /include/kvm | |
| parent | 0803e6051c1562e1525c3e044313390bf8b35c2b (diff) | |
| parent | 99fec39e7725d091c94d1bb0242e40c8092994f6 (diff) | |
| download | linux-stable-ea2301b6220117398a1de4f4bc853fbe886d5e08.tar.gz linux-stable-ea2301b6220117398a1de4f4bc853fbe886d5e08.tar.bz2 linux-stable-ea2301b6220117398a1de4f4bc853fbe886d5e08.zip | |
Merge branch 'linus' into x86/dma, to resolve a conflict with upstream
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/kvm')
| -rw-r--r-- | include/kvm/arm_vgic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index cdbd142ca7f2..02924ae2527e 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -360,6 +360,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); |