diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-03-18 02:37:19 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-25 01:57:32 +0400 |
| commit | ee8fa1c67f0b873a324960f0ca9fa1d7e49aa86b (patch) | |
| tree | 82b011027eea390ed345cb73a95dcf8962f030d0 | |
| parent | ee523ca1e456d754d66be6deab910131e4e1dbf8 (diff) | |
| download | linux-ee8fa1c67f0b873a324960f0ca9fa1d7e49aa86b.tar.xz | |
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>
| -rw-r--r-- | arch/x86/xen/events.c | 8 |
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; } |