---

yaml --- r: 313741 b: refs/heads/master c: 123df01 h: refs/heads/master i: 313739: 3ca9dc1 v: v3
git-mirror · Jun 13, 2012 · ad76411 · ad76411
1 parent b145d8f
commit ad76411
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be9c00295b34760ea2f9667929049f094116b5a8
+refs/heads/master: 123df01e8e046d6065089e1bff29aa3fc48d4420
diff --git a/trunk/drivers/sh/intc/virq.c b/trunk/drivers/sh/intc/virq.c
@@ -219,12 +219,14 @@ static void __init intc_subgroup_map(struct intc_desc_int *d)
 		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);