diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-08-04 13:59:56 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-08-04 13:59:56 +0200 |
| commit | 6f49b2f3414622d3e41135a65dac98968956662b (patch) | |
| tree | efd4c358a40b9e6adb9dd35de3407bbf17bd2935 /arch/x86/kvm | |
| parent | abe9efa79be02cf2ba27f643b214b07877bb050b (diff) | |
| parent | 89581f06b2bc225f0c9822fa52e714aa2e3810dd (diff) | |
| download | linux-6f49b2f3414622d3e41135a65dac98968956662b.tar.bz2 | |
Merge tag 'kvm-arm-for-4.8-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Changes for v4.8 - Take 2
Includes GSI routing support to go along with the new VGIC and a small fix that
has been cooking in -next for a while.
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/irq.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index 61ebdc13a29a..035731eb3897 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h @@ -120,4 +120,7 @@ void __kvm_migrate_timers(struct kvm_vcpu *vcpu); int apic_has_pending_timer(struct kvm_vcpu *vcpu); +int kvm_setup_default_irq_routing(struct kvm *kvm); +int kvm_setup_empty_irq_routing(struct kvm *kvm); + #endif |