From ad76411ba2c4f488fb779b69eb97ccc382bef48c Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 24 May 2012 19:24:18 +0900
Subject: [PATCH] --- yaml --- r: 313741 b: refs/heads/master c:
 123df01e8e046d6065089e1bff29aa3fc48d4420 h: refs/heads/master i:   313739:
 3ca9dc1c62fc2fdb73f026c4a9434fa4431697a7 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/sh/intc/virq.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dcfab1a14821..e9defec5c0e9 100644
--- 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
index 93cec21e788b..f30ac9354ff2 100644
--- 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);