summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-23 11:36:14 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-05-23 11:36:14 +0900
commit972b1943becc2dd4335c1b9d8ecd07c5ad44dd88 (patch)
tree7fb981ddaa1a8d566d98f3524b0cad3461439ec0 /drivers/sh
parent8ace5c4698ec8da53e69095596718d5a936433de (diff)
parented170924dd0db14b135a388966e0b6fd5188c3e5 (diff)
downloadlinux-3.10-972b1943becc2dd4335c1b9d8ecd07c5ad44dd88.tar.gz
linux-3.10-972b1943becc2dd4335c1b9d8ecd07c5ad44dd88.tar.bz2
linux-3.10-972b1943becc2dd4335c1b9d8ecd07c5ad44dd88.zip
Merge branch 'sh/genirq-threading' into sh-latest
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc/virq.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c
index ce5f81d7cc6..1e6e2d0353e 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);