Merge tag 'kvm-arm-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...

[cascardo/linux.git] / arch / x86 / kvm / irq.c

diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
index bd0da43..a1ec6a5 100644 (file)
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
@@ -108,7 +108,7 @@ int kvm_cpu_get_interrupt(struct kvm_vcpu *v)
 
        vector = kvm_cpu_get_extint(v);
 
-       if (kvm_apic_vid_enabled(v->kvm) || vector != -1)
+       if (vector != -1)
                return vector;                  /* PIC */
 
        return kvm_get_apic_interrupt(v);       /* APIC */