summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-28 08:43:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-28 08:43:32 -0800
commitce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22 (patch)
treecba248174b2380106b93bb73bdf5de5368e1dca8
parent52553ddffad76ccf192d4dd9ce88d5818f57f62a (diff)
parent2ed0e645f358c26f4f4a7aed56a9488db0020ad1 (diff)
downloadblackbird-op-linux-ce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22.tar.gz
blackbird-op-linux-ce8f55c2a0ff652480c12a4f1f22ff5ce15e3a22.zip
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
-rw-r--r--kernel/irq/manage.c2
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,
return -ENOMEM;
action->handler = handler;
- action->flags = IRQF_PERCPU;
+ action->flags = IRQF_PERCPU | IRQF_NO_SUSPEND;
action->name = devname;
action->percpu_dev_id = dev_id;
OpenPOWER on IntegriCloud