aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/manage.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-11 18:49:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-11 18:49:31 +0100
commit805499a6d5d7b7fa8528170d1b2869ea88485f99 (patch)
tree03fc29f7f07709c267e8dad29e8ab8f85b24938b /kernel/irq/manage.c
parent254c44ea822066e24ab5efbdff1e43b8fe45ae76 (diff)
parentaac4dd1dab8acfc244d697473d2a5f4424a5746c (diff)
downloadkernel_samsung_smdk4412-805499a6d5d7b7fa8528170d1b2869ea88485f99.zip
kernel_samsung_smdk4412-805499a6d5d7b7fa8528170d1b2869ea88485f99.tar.gz
kernel_samsung_smdk4412-805499a6d5d7b7fa8528170d1b2869ea88485f99.tar.bz2
Merge branch 'irq-davinci' of git://gitorious.org/linux-davinci/linux-davinci into devel-stable
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r--kernel/irq/manage.c3
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);
}
/*