aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 13:25:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 13:25:43 -0700
commit17879857821adad4e180c5d6457c3b8bbf1d0c0c (patch)
tree28afa4b59847ca13b8d51a83fa04954916387de9 /drivers/xen
parentMerge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
parentxen: Do not suspend IPI IRQs. (diff)
downloadlinux-dev-17879857821adad4e180c5d6457c3b8bbf1d0c0c.tar.xz
linux-dev-17879857821adad4e180c5d6457c3b8bbf1d0c0c.zip
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.c1
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,
if (irq < 0)
return irq;
+ irqflags |= IRQF_NO_SUSPEND;
retval = request_irq(irq, handler, irqflags, devname, dev_id);
if (retval != 0) {
unbind_from_irq(irq);