From 2b009649274fda42210c3d2ca72ecf9d47343595 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 31 Aug 2009 15:15:33 +0900
Subject: [PATCH] --- yaml --- r: 163551 b: refs/heads/master c:
 1279b7f1168ad6a2606191090f8a96eba64766a4 h: refs/heads/master i:   163549:
 04c3144869ed1640b41a5d6895db22bb9b029b65   163547:
 c0d29b4f59243a2869636acd3fbc2f470be3b6d9   163543:
 eee1a42cdda5b49b2b772701d4ba7391e0c3573d   163535:
 13bb6b0e1ce5754457842787244804817a1c1326   163519:
 d169526ac0d852dbdfcf70ecda12bc4e03ce2e54 v: v3

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

diff --git a/[refs] b/[refs]
index 39a5c7971f5a..43686e551f3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f6dafc5fcbf3fddce345c47da1f277a156fe22a
+refs/heads/master: 1279b7f1168ad6a2606191090f8a96eba64766a4
diff --git a/trunk/drivers/sh/intc.c b/trunk/drivers/sh/intc.c
index a9174ec72853..559b5fe9dc0f 100644
--- a/trunk/drivers/sh/intc.c
+++ b/trunk/drivers/sh/intc.c
@@ -749,7 +749,7 @@ void __init register_intc_controller(struct intc_desc *desc)
 
 		irq_desc = irq_to_desc_alloc_node(irq, numa_node_id());
 		if (unlikely(!irq_desc)) {
-			printk(KERN_INFO "can not get irq_desc for %d\n", irq);
+			pr_info("can't get irq_desc for %d\n", irq);
 			continue;
 		}
 
@@ -762,6 +762,17 @@ void __init register_intc_controller(struct intc_desc *desc)
 			if (vect->enum_id != vect2->enum_id)
 				continue;
 
+			/*
+			 * In the case of multi-evt handling and sparse
+			 * IRQ support, each vector still needs to have
+			 * its own backing irq_desc.
+			 */
+			irq_desc = irq_to_desc_alloc_node(irq2, numa_node_id());
+			if (unlikely(!irq_desc)) {
+				pr_info("can't get irq_desc for %d\n", irq2);
+				continue;
+			}
+
 			vect2->enum_id = 0;
 
 			/* redirect this interrupts to the first one */