diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 11:43:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-28 11:43:32 -0500 |
| commit | ce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22 (patch) | |
| tree | cba248174b2380106b93bb73bdf5de5368e1dca8 /kernel | |
| parent | 52553ddffad76ccf192d4dd9ce88d5818f57f62a (diff) | |
| parent | 2ed0e645f358c26f4f4a7aed56a9488db0020ad1 (diff) | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Don't allow per cpu interrupts to be suspended
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 67ce837ae52c..0e2b179bc7b3 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -1596,7 +1596,7 @@ int request_percpu_irq(unsigned int irq, irq_handler_t handler, | |||
| 1596 | return -ENOMEM; | 1596 | return -ENOMEM; |
| 1597 | 1597 | ||
| 1598 | action->handler = handler; | 1598 | action->handler = handler; |
| 1599 | action->flags = IRQF_PERCPU; | 1599 | action->flags = IRQF_PERCPU | IRQF_NO_SUSPEND; |
| 1600 | action->name = devname; | 1600 | action->name = devname; |
| 1601 | action->percpu_dev_id = dev_id; | 1601 | action->percpu_dev_id = dev_id; |
| 1602 | 1602 | ||