diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-03-17 19:37:19 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-24 17:57:32 -0400 |
commit | ee8fa1c67f0b873a324960f0ca9fa1d7e49aa86b (patch) | |
tree | 82b011027eea390ed345cb73a95dcf8962f030d0 /arch/x86/xen/events.c | |
parent | ee523ca1e456d754d66be6deab910131e4e1dbf8 (diff) |
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>
Diffstat (limited to 'arch/x86/xen/events.c')
-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) | |||
601 | static int retrigger_dynirq(unsigned int irq) | 601 | static int retrigger_dynirq(unsigned int irq) |
602 | { | 602 | { |
603 | int evtchn = evtchn_from_irq(irq); | 603 | int evtchn = evtchn_from_irq(irq); |
604 | struct shared_info *sh = HYPERVISOR_shared_info; | ||
604 | int ret = 0; | 605 | int ret = 0; |
605 | 606 | ||
606 | if (VALID_EVTCHN(evtchn)) { | 607 | if (VALID_EVTCHN(evtchn)) { |
607 | set_evtchn(evtchn); | 608 | int masked; |
609 | |||
610 | masked = sync_test_and_set_bit(evtchn, sh->evtchn_mask); | ||
611 | sync_set_bit(evtchn, sh->evtchn_pending); | ||
612 | if (!masked) | ||
613 | unmask_evtchn(evtchn); | ||
608 | ret = 1; | 614 | ret = 1; |
609 | } | 615 | } |
610 | 616 | ||