1 files changed, 10 insertions, 1 deletions

diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index 9e6e7e04de98..2f9703dcd913 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -83,13 +83,22 @@ static inline struct kvm_pic *pic_irqchip(struct kvm *kvm)
         return kvm->arch.vpic;
 }
 
+static inline int irqchip_split(struct kvm *kvm)
+{
+        return kvm->arch.irqchip_split;
+}
+
 static inline int irqchip_in_kernel(struct kvm *kvm)
 {
         struct kvm_pic *vpic = pic_irqchip(kvm);
+        bool ret;
+
+        ret = (vpic != NULL);
+        ret |= irqchip_split(kvm);
 
         /* Read vpic before kvm->irq_routing.  */
         smp_rmb();
-        return vpic != NULL;
+        return ret;
 }
 
 static inline int lapic_in_kernel(struct kvm_vcpu *vcpu)