diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:30:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 17:30:15 -0700 |
| commit | acd30250d7d0f495685d1c7c6184636a22fcdf7f (patch) | |
| tree | 40f4e7e092de434c49a5f67f27ff1d3bf71000f9 /kernel/irq/manage.c | |
| parent | 6595b4a940c4c447b619ab5268378ed03e632694 (diff) | |
| parent | edf76f8307c350bcb81f0c760118a991b3e62956 (diff) | |
| download | kernel_samsung_smdk4412-acd30250d7d0f495685d1c7c6184636a22fcdf7f.zip kernel_samsung_smdk4412-acd30250d7d0f495685d1c7c6184636a22fcdf7f.tar.gz kernel_samsung_smdk4412-acd30250d7d0f495685d1c7c6184636a22fcdf7f.tar.bz2 | |
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:
irq: Export functions to allow modular irq drivers
genirq: Uninline and sanity check generic_handle_irq()
genirq: Remove pointless ifdefs
genirq: Make generic irq chip depend on CONFIG_GENERIC_IRQ_CHIP
genirq: Add chip suspend and resume callbacks
genirq: Implement a generic interrupt chip
genirq: Support per-IRQ thread disabling.
genirq: irq_desc: Document preflow_handler and affinity_hint
genirq: Update DocBook comments
genirq: Forgotten updates/deletions after removal of compat code
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 07c1611..f7ce002 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -900,7 +900,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) */ new->handler = irq_nested_primary_handler; } else { - irq_setup_forced_threading(new); + if (irq_settings_can_thread(desc)) + irq_setup_forced_threading(new); } /* |