diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-05-24 19:24:18 +0900 | 
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-13 12:08:36 +0900 | 
| commit | 123df01e8e046d6065089e1bff29aa3fc48d4420 (patch) | |
| tree | 4453d8a9cc4686ca885a4b5f22f9864260d81cd7 | |
| parent | be9c00295b34760ea2f9667929049f094116b5a8 (diff) | |
| download | olio-linux-3.10-123df01e8e046d6065089e1bff29aa3fc48d4420.tar.xz olio-linux-3.10-123df01e8e046d6065089e1bff29aa3fc48d4420.zip  | |
sh: intc: Allocate subgroup virq backing desc directly.
This switches to using irq_alloc_desc() directly for subgroup IRQs.
We still need to call activate_irq() on these in order to make them
requestable, at least up until these get moved in to their own irq
domain..
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -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);  |