diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-13 00:22:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-13 00:22:13 -0500 |
| commit | 725da8dee445662beea77d3f42c3f4c79f7a7a0e (patch) | |
| tree | be1e2bd103c69d7bbace3fffd97bc3d714bbc3d7 /arch/x86/kvm/irq.c | |
| parent | ce78c76f33b9f43b92444869d1723f9e4260797a (diff) | |
| parent | ddb5388ffd0ad75d07e7b78181a0b579824ba6f0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86/kvm/irq.c')
| -rw-r--r-- | arch/x86/kvm/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index 097060e33bd6..3982b479bb5f 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c @@ -76,7 +76,7 @@ int kvm_cpu_has_injectable_intr(struct kvm_vcpu *v) if (kvm_cpu_has_extint(v)) return 1; - if (kvm_vcpu_apic_vid_enabled(v)) + if (kvm_vcpu_apicv_active(v)) return 0; return kvm_apic_has_interrupt(v) != -1; /* LAPIC */ |