diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:36:14 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-22 22:36:14 -0400 |
commit | 972b1943becc2dd4335c1b9d8ecd07c5ad44dd88 (patch) | |
tree | 7fb981ddaa1a8d566d98f3524b0cad3461439ec0 /drivers/sh | |
parent | 8ace5c4698ec8da53e69095596718d5a936433de (diff) | |
parent | ed170924dd0db14b135a388966e0b6fd5188c3e5 (diff) |
Merge branch 'sh/genirq-threading' into sh-latest
Diffstat (limited to 'drivers/sh')
-rw-r--r-- | drivers/sh/intc/virq.c | 5 |
1 files changed, 5 insertions, 0 deletions
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: | |||
235 | 235 | ||
236 | irq_set_handler_data(irq, (void *)entry->handle); | 236 | irq_set_handler_data(irq, (void *)entry->handle); |
237 | 237 | ||
238 | /* | ||
239 | * Set the virtual IRQ as non-threadable. | ||
240 | */ | ||
241 | irq_set_nothread(irq); | ||
242 | |||
238 | irq_set_chained_handler(entry->pirq, intc_virq_handler); | 243 | irq_set_chained_handler(entry->pirq, intc_virq_handler); |
239 | add_virq_to_pirq(entry->pirq, irq); | 244 | add_virq_to_pirq(entry->pirq, irq); |
240 | 245 | ||