diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 11:36:14 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 11:36:14 +0900 |
| commit | 972b1943becc2dd4335c1b9d8ecd07c5ad44dd88 (patch) | |
| tree | 7fb981ddaa1a8d566d98f3524b0cad3461439ec0 | |
| parent | 8ace5c4698ec8da53e69095596718d5a936433de (diff) | |
| parent | ed170924dd0db14b135a388966e0b6fd5188c3e5 (diff) | |
| download | blackbird-op-linux-972b1943becc2dd4335c1b9d8ecd07c5ad44dd88.tar.gz blackbird-op-linux-972b1943becc2dd4335c1b9d8ecd07c5ad44dd88.zip | |
Merge branch 'sh/genirq-threading' into sh-latest
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/sh/intc/virq.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index bc439de48cd1..b44e37753b9a 100644 --- 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 index ce5f81d7cc6b..1e6e2d0353ea 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c @@ -235,6 +235,11 @@ restart: 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); |
