From 3149f20bb9509c511cdf7dddc21768fd210c9a63 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 5 Feb 2011 20:08:59 +0000 Subject: [PATCH] --- yaml --- r: 234189 b: refs/heads/master c: 676dc3cf5bc36a9e129a3ad8fe3bd7b2ebf20f5d h: refs/heads/master i: 234187: c27ace2611aadf78c3f42728e8e6725a7c3c27bd v: v3 --- [refs] | 2 +- trunk/drivers/xen/events.c | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 154bc6feea1f..cef20f365c28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8aef4857d26c46ca3d4f1a7f3a7aa4b51a72385e +refs/heads/master: 676dc3cf5bc36a9e129a3ad8fe3bd7b2ebf20f5d diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c index 5aa422a3c3cd..975e90fa6d5a 100644 --- a/trunk/drivers/xen/events.c +++ b/trunk/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(); }