summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-05 20:08:59 +0000
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-03 12:02:21 -0500
commit676dc3cf5bc36a9e129a3ad8fe3bd7b2ebf20f5d (patch)
tree30e5aedd504d455dd9aaadbcc50328c2f57545b7 /drivers
parent8aef4857d26c46ca3d4f1a7f3a7aa4b51a72385e (diff)
downloadlinux-676dc3cf5bc36a9e129a3ad8fe3bd7b2ebf20f5d.tar.gz
linux-676dc3cf5bc36a9e129a3ad8fe3bd7b2ebf20f5d.tar.bz2
linux-676dc3cf5bc36a9e129a3ad8fe3bd7b2ebf20f5d.zip
xen: Use IRQF_FORCE_RESUME
Mark the IRQF_NO_SUSPEND interrupts IRQF_FORCE_RESUME and remove the extra walk through the interrupt descriptors. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/xen/events.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 5aa422a3c3cd..975e90fa6d5a 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -977,7 +977,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
if (irq < 0)
return irq;
- irqflags |= IRQF_NO_SUSPEND;
+ irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME;
retval = request_irq(irq, handler, irqflags, devname, dev_id);
if (retval != 0) {
unbind_from_irq(irq);
@@ -1433,7 +1433,6 @@ void xen_poll_irq(int irq)
void xen_irq_resume(void)
{
unsigned int cpu, irq, evtchn;
- struct irq_desc *desc;
init_evtchn_cpu_bindings();
@@ -1453,23 +1452,6 @@ void xen_irq_resume(void)
restore_cpu_ipis(cpu);
}
- /*
- * Unmask any IRQF_NO_SUSPEND IRQs which are enabled. These
- * are not handled by the IRQ core.
- */
- for_each_irq_desc(irq, desc) {
- if (!desc->action || !(desc->action->flags & IRQF_NO_SUSPEND))
- continue;
- if (desc->status & IRQ_DISABLED)
- continue;
-
- evtchn = evtchn_from_irq(irq);
- if (evtchn == -1)
- continue;
-
- unmask_evtchn(evtchn);
- }
-
restore_cpu_pirqs();
}