sh: Wrap irq_to_desc_alloc_cpu() around CONFIG_SPARSE_IRQ temporarily.

irq_to_desc_alloc_cpu() has been renamed to irq_to_desc_alloc_node() in
-next, but as we can not presently enable SPARSE_IRQ without the early
irq_desc alloc patch, protect it with an ifdef until the interface has
settled and we are ready to enable it system-wide.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index fa0c846..6ad40db 100644 (file)
--- a/arch/sh/kernel/cpu/irq/ipr.c
+++ b/arch/sh/kernel/cpu/irq/ipr.c
@@ -59,17 +59,21 @@ void register_ipr_controller(struct ipr_desc *desc)
 
        for (i = 0; i < desc->nr_irqs; i++) {
                struct ipr_data *p = desc->ipr_data + i;
+#ifdef CONFIG_SPARSE_IRQ
                struct irq_desc *irq_desc;
+#endif
 
                BUG_ON(p->ipr_idx >= desc->nr_offsets);
                BUG_ON(!desc->ipr_offsets[p->ipr_idx]);
 
+#ifdef CONFIG_SPARSE_IRQ
                irq_desc = irq_to_desc_alloc_cpu(p->irq, smp_processor_id());
                if (unlikely(!irq_desc)) {
                        printk(KERN_INFO "can not get irq_desc for %d\n",
                               p->irq);
                        continue;
                }
+#endif
 
                disable_irq_nosync(p->irq);
                set_irq_chip_and_handler_name(p->irq, &desc->chip,

diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index 098b767..caf0656 100644 (file)
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -771,16 +771,19 @@ void __init register_intc_controller(struct intc_desc *desc)
        for (i = 0; i < desc->nr_vectors; i++) {
                struct intc_vect *vect = desc->vectors + i;
                unsigned int irq = evt2irq(vect->vect);
+#ifdef CONFIG_SPARSE_IRQ
                struct irq_desc *irq_desc;
-
+#endif
                if (!vect->enum_id)
                        continue;
 
+#ifdef CONFIG_SPARSE_IRQ
                irq_desc = irq_to_desc_alloc_cpu(irq, cpu);
                if (unlikely(!irq_desc)) {
                        printk(KERN_INFO "can not get irq_desc for %d\n", irq);
                        continue;
                }
+#endif
 
                intc_register_irq(desc, d, vect->enum_id, irq);
        }