Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kvm / irq.h

diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index ad68c73008c57f0c1926f0cec9e83f79fe070252..3d782a2c336aceb4b4fac3092b68f1c3143e1a12 100644 (file)
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -74,7 +74,7 @@ struct kvm_pic {
 };
 
 struct kvm_pic *kvm_create_pic(struct kvm *kvm);
-void kvm_destroy_pic(struct kvm *kvm);
+void kvm_destroy_pic(struct kvm_pic *vpic);
 int kvm_pic_read_irq(struct kvm *kvm);
 void kvm_pic_update_irq(struct kvm_pic *s);
 
@@ -85,11 +85,11 @@ static inline struct kvm_pic *pic_irqchip(struct kvm *kvm)
 
 static inline int irqchip_in_kernel(struct kvm *kvm)
 {
-       int ret;
+       struct kvm_pic *vpic = pic_irqchip(kvm);
 
-       ret = (pic_irqchip(kvm) != NULL);
+       /* Read vpic before kvm->irq_routing.  */
        smp_rmb();
-       return ret;
+       return vpic != NULL;
 }
 
 void kvm_pic_reset(struct kvm_kpic_state *s);