1 files changed, 7 insertions, 1 deletions

diff --git a/arch/x86/xen/events.c b/arch/x86/xen/events.c
index 0140981e93c4..f73b53bd65b7 100644
--- a/arch/x86/xen/events.c
+++ b/arch/x86/xen/events.c
@@ -601,10 +601,16 @@ static void ack_dynirq(unsigned int irq)
 static int retrigger_dynirq(unsigned int irq)
 {
         int evtchn = evtchn_from_irq(irq);
+        struct shared_info *sh = HYPERVISOR_shared_info;
         int ret = 0;
 
         if (VALID_EVTCHN(evtchn)) {
-                set_evtchn(evtchn);
+                int masked;
+
+                masked = sync_test_and_set_bit(evtchn, sh->evtchn_mask);
+                sync_set_bit(evtchn, sh->evtchn_pending);
+                if (!masked)
+                        unmask_evtchn(evtchn);
                 ret = 1;
         }