summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 16:44:09 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 16:44:09 +0200
commit1f6e05171bb5cc32a4d6437ab2269fc21d169ca7 (patch)
treecf8a99623fe30fde6c5a729f329aa3a4e282886a /drivers
parent19b4a8d520a6e0176dd52aaa429261ad4fcaa545 (diff)
parent9bab0b7fbaceec47d32db51cd9e59c82fb071f5a (diff)
downloadlinux-1f6e05171bb5cc32a4d6437ab2269fc21d169ca7.tar.gz
linux-1f6e05171bb5cc32a4d6437ab2269fc21d169ca7.tar.bz2
linux-1f6e05171bb5cc32a4d6437ab2269fc21d169ca7.zip
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier genirq: Fix fatfinered fixup really genirq: percpu: allow interrupt type to be set at enable time genirq: Add support for per-cpu dev_id interrupts genirq: Add IRQCHIP_SKIP_SET_WAKE flag
Diffstat (limited to 'drivers')
-rw-r--r--drivers/xen/events.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 7a55b292bf39..0eb8a57cc808 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -1049,7 +1049,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,
if (irq < 0)
return irq;
- irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME;
+ irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME | IRQF_EARLY_RESUME;
retval = request_irq(irq, handler, irqflags, devname, dev_id);
if (retval != 0) {
unbind_from_irq(irq);