sh: Fix up simplified multi-evt handling under sparseirq.

[deliverable/linux.git] / drivers / sh / intc.c

diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index a9174ec7285326e02e087333c0002a31207be365..559b5fe9dc0fd0ad7c6b96db9f5427fc76ccb0eb 100644 (file)
--- a/drivers/sh/intc.c
+++ b/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 */