浏览代码

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

Paul Mundt 14 年之前
父节点
当前提交
972b1943be
共有 2 个文件被更改,包括 6 次插入0 次删除
  1. 1 0
      arch/sh/Kconfig
  2. 5 0
      drivers/sh/intc/virq.c

+ 1 - 0
arch/sh/Kconfig

@@ -21,6 +21,7 @@ config SUPERH
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_GENERIC_HARDIRQS
 	select HAVE_GENERIC_HARDIRQS
 	select HAVE_SPARSE_IRQ
 	select HAVE_SPARSE_IRQ
+	select IRQ_FORCED_THREADING
 	select RTC_LIB
 	select RTC_LIB
 	select GENERIC_ATOMIC64
 	select GENERIC_ATOMIC64
 	select GENERIC_IRQ_SHOW
 	select GENERIC_IRQ_SHOW

+ 5 - 0
drivers/sh/intc/virq.c

@@ -235,6 +235,11 @@ restart:
 
 
 		irq_set_handler_data(irq, (void *)entry->handle);
 		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);
 		irq_set_chained_handler(entry->pirq, intc_virq_handler);
 		add_virq_to_pirq(entry->pirq, irq);
 		add_virq_to_pirq(entry->pirq, irq);