diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:25:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:25:43 -0400 |
| commit | 17879857821adad4e180c5d6457c3b8bbf1d0c0c (patch) | |
| tree | 28afa4b59847ca13b8d51a83fa04954916387de9 /drivers/xen | |
| parent | b62ad9ab181a67207a4c8c373461b587c4861a68 (diff) | |
| parent | 4877c737283813bdb4bebfa3168c1585f6e3a8ca (diff) | |
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
xen: Do not suspend IPI IRQs.
powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts
ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt
irq: Add new IRQ flag IRQF_NO_SUSPEND
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/events.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 5e1f34892dcc..72f91bff29c7 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
| @@ -550,6 +550,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi, | |||
| 550 | if (irq < 0) | 550 | if (irq < 0) |
| 551 | return irq; | 551 | return irq; |
| 552 | 552 | ||
| 553 | irqflags |= IRQF_NO_SUSPEND; | ||
| 553 | retval = request_irq(irq, handler, irqflags, devname, dev_id); | 554 | retval = request_irq(irq, handler, irqflags, devname, dev_id); |
| 554 | if (retval != 0) { | 555 | if (retval != 0) { |
| 555 | unbind_from_irq(irq); | 556 | unbind_from_irq(irq); |