Merge branch 'sh/genirq-threading' into sh-latest

git-mirror · May 23, 2011 · 972b194 · 972b194
2 parents 8ace5c4 + ed17092
commit 972b194
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
@@ -21,6 +21,7 @@ config SUPERH
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_GENERIC_HARDIRQS
 	select HAVE_SPARSE_IRQ
+	select IRQ_FORCED_THREADING
 	select RTC_LIB
 	select GENERIC_ATOMIC64
 	select GENERIC_IRQ_SHOW

diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
@@ -235,6 +235,11 @@ static void __init intc_subgroup_map(struct intc_desc_int *d)
 
 		irq_set_handler_data(irq, (void *)entry->handle);
 
+		/*
+		 * Set the virtual IRQ as non-threadable.
+		 */
+		irq_set_nothread(irq);
+
 		irq_set_chained_handler(entry->pirq, intc_virq_handler);
 		add_virq_to_pirq(entry->pirq, irq);