diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 10:44:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 10:44:09 -0400 |
| commit | 1f6e05171bb5cc32a4d6437ab2269fc21d169ca7 (patch) | |
| tree | cf8a99623fe30fde6c5a729f329aa3a4e282886a /drivers/xen | |
| parent | 19b4a8d520a6e0176dd52aaa429261ad4fcaa545 (diff) | |
| parent | 9bab0b7fbaceec47d32db51cd9e59c82fb071f5a (diff) | |
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/xen')
| -rw-r--r-- | drivers/xen/events.c | 2 |
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, | |||
| 1049 | if (irq < 0) | 1049 | if (irq < 0) |
| 1050 | return irq; | 1050 | return irq; |
| 1051 | 1051 | ||
| 1052 | irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME; | 1052 | irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME | IRQF_EARLY_RESUME; |
| 1053 | retval = request_irq(irq, handler, irqflags, devname, dev_id); | 1053 | retval = request_irq(irq, handler, irqflags, devname, dev_id); |
| 1054 | if (retval != 0) { | 1054 | if (retval != 0) { |
| 1055 | unbind_from_irq(irq); | 1055 | unbind_from_irq(irq); |