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 /drivers | |
| 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')
| -rw-r--r-- | drivers/input/misc/ixp4xx-beeper.c | 3 | ||||
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 9 | ||||
| -rw-r--r-- | drivers/xen/events.c | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index 9946d73624b9..9dfd6e5f786f 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c @@ -115,7 +115,8 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev) input_dev->event = ixp4xx_spkr_event; err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt, - IRQF_DISABLED | IRQF_TIMER, "ixp4xx-beeper", (void *) dev->id); + IRQF_DISABLED | IRQF_NO_SUSPEND, "ixp4xx-beeper", + (void *) dev->id); if (err) goto err_free_device; diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 3d4fc0f7b00b..35bc2737412f 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -400,11 +400,12 @@ static int __init via_pmu_start(void) printk(KERN_ERR "via-pmu: can't map interrupt\n"); return -ENODEV; } - /* We set IRQF_TIMER because we don't want the interrupt to be disabled - * between the 2 passes of driver suspend, we control our own disabling - * for that one + /* We set IRQF_NO_SUSPEND because we don't want the interrupt + * to be disabled between the 2 passes of driver suspend, we + * control our own disabling for that one */ - if (request_irq(irq, via_pmu_interrupt, IRQF_TIMER, "VIA-PMU", (void *)0)) { + if (request_irq(irq, via_pmu_interrupt, IRQF_NO_SUSPEND, + "VIA-PMU", (void *)0)) { printk(KERN_ERR "via-pmu: can't request irq %d\n", irq); return -ENODEV; } 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); |