diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 13:25:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 13:25:43 -0700 |
| commit | 17879857821adad4e180c5d6457c3b8bbf1d0c0c (patch) | |
| tree | 28afa4b59847ca13b8d51a83fa04954916387de9 /kernel | |
| parent | b62ad9ab181a67207a4c8c373461b587c4861a68 (diff) | |
| parent | 4877c737283813bdb4bebfa3168c1585f6e3a8ca (diff) | |
| download | linux-17879857821adad4e180c5d6457c3b8bbf1d0c0c.tar.gz linux-17879857821adad4e180c5d6457c3b8bbf1d0c0c.tar.bz2 linux-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 'kernel')
| -rw-r--r-- | kernel/irq/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index e1497481fe8a..c3003e9d91a3 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -216,7 +216,7 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc) void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend) { if (suspend) { - if (!desc->action || (desc->action->flags & IRQF_TIMER)) + if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND)) return; desc->status |= IRQ_SUSPENDED; } |