From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Mon, 17 Mar 2008 23:37:19 +0000 (-0700)
Subject: xen: make sure retriggered events are set pending
X-Git-Tag: v2.6.26-rc1~1065^2~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ee8fa1c67f0b873a324960f0ca9fa1d7e49aa86b;p=linux-2.6-omap-h63xx.git

xen: make sure retriggered events are set pending

retrigger_dynirq() was incomplete, and didn't properly set the event
to be pending again.  It doesn't seem to actually get used.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/xen/events.c b/arch/x86/xen/events.c
index 0140981e93c..f73b53bd65b 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;
 	}