1 files changed, 7 insertions, 1 deletions

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index a7fe1783d245..a393c2b6b1b6 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -3490,9 +3490,15 @@ static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
         irq_map = &pimap->mapped[i];
 
         irq_map->v_hwirq = guest_gsi;
-        irq_map->r_hwirq = desc->irq_data.hwirq;
         irq_map->desc = desc;
 
+        /*
+         * Order the above two stores before the next to serialize with
+         * the KVM real mode handler.
+         */
+        smp_wmb();
+        irq_map->r_hwirq = desc->irq_data.hwirq;
+
         if (i == pimap->n_mapped)
                 pimap->n_mapped++;