diff --git a/[refs] b/[refs]
index dde2feaab880..ce4a79bc9a55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee523ca1e456d754d66be6deab910131e4e1dbf8
+refs/heads/master: ee8fa1c67f0b873a324960f0ca9fa1d7e49aa86b
diff --git a/trunk/arch/x86/xen/events.c b/trunk/arch/x86/xen/events.c
index 0140981e93c4..f73b53bd65b7 100644
--- a/trunk/arch/x86/xen/events.c
+++ b/trunk/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;
 	}