diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 12:12:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 12:12:41 +0900 |
| commit | d978006a54ddf73cdeb3c59d1862a17f4445751c (patch) | |
| tree | 407e4e37402936ef2c06bee64d8575390c3339f6 /drivers/sh/intc/virq.c | |
| parent | f21efd45362d555b3b93960a5736ad7c6fc1f367 (diff) | |
| parent | 123df01e8e046d6065089e1bff29aa3fc48d4420 (diff) | |
Merge branch 'sh/dynamic-irq-cleanup' into sh-latest
Conflicts:
drivers/sh/intc/dynamic.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh/intc/virq.c')
| -rw-r--r-- | drivers/sh/intc/virq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index 93cec21e788..f30ac9354ff 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c @@ -219,12 +219,14 @@ restart: if (radix_tree_deref_retry(entry)) goto restart; - irq = create_irq(); + irq = irq_alloc_desc(numa_node_id()); if (unlikely(irq < 0)) { pr_err("no more free IRQs, bailing..\n"); break; } + activate_irq(irq); + pr_info("Setting up a chained VIRQ from %d -> %d\n", irq, entry->pirq); |