aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sh/kernel/cpu/irq/ipr.c4
-rw-r--r--drivers/sh/intc.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c
index fa0c8467a280..6ad40dbad881 100644
--- 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)
59 59
60 for (i = 0; i < desc->nr_irqs; i++) { 60 for (i = 0; i < desc->nr_irqs; i++) {
61 struct ipr_data *p = desc->ipr_data + i; 61 struct ipr_data *p = desc->ipr_data + i;
62#ifdef CONFIG_SPARSE_IRQ
62 struct irq_desc *irq_desc; 63 struct irq_desc *irq_desc;
64#endif
63 65
64 BUG_ON(p->ipr_idx >= desc->nr_offsets); 66 BUG_ON(p->ipr_idx >= desc->nr_offsets);
65 BUG_ON(!desc->ipr_offsets[p->ipr_idx]); 67 BUG_ON(!desc->ipr_offsets[p->ipr_idx]);
66 68
69#ifdef CONFIG_SPARSE_IRQ
67 irq_desc = irq_to_desc_alloc_cpu(p->irq, smp_processor_id()); 70 irq_desc = irq_to_desc_alloc_cpu(p->irq, smp_processor_id());
68 if (unlikely(!irq_desc)) { 71 if (unlikely(!irq_desc)) {
69 printk(KERN_INFO "can not get irq_desc for %d\n", 72 printk(KERN_INFO "can not get irq_desc for %d\n",
70 p->irq); 73 p->irq);
71 continue; 74 continue;
72 } 75 }
76#endif
73 77
74 disable_irq_nosync(p->irq); 78 disable_irq_nosync(p->irq);
75 set_irq_chip_and_handler_name(p->irq, &desc->chip, 79 set_irq_chip_and_handler_name(p->irq, &desc->chip,
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index 098b767e9afd..caf065694042 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -771,16 +771,19 @@ void __init register_intc_controller(struct intc_desc *desc)
771 for (i = 0; i < desc->nr_vectors; i++) { 771 for (i = 0; i < desc->nr_vectors; i++) {
772 struct intc_vect *vect = desc->vectors + i; 772 struct intc_vect *vect = desc->vectors + i;
773 unsigned int irq = evt2irq(vect->vect); 773 unsigned int irq = evt2irq(vect->vect);
774#ifdef CONFIG_SPARSE_IRQ
774 struct irq_desc *irq_desc; 775 struct irq_desc *irq_desc;
775 776#endif
776 if (!vect->enum_id) 777 if (!vect->enum_id)
777 continue; 778 continue;
778 779
780#ifdef CONFIG_SPARSE_IRQ
779 irq_desc = irq_to_desc_alloc_cpu(irq, cpu); 781 irq_desc = irq_to_desc_alloc_cpu(irq, cpu);
780 if (unlikely(!irq_desc)) { 782 if (unlikely(!irq_desc)) {
781 printk(KERN_INFO "can not get irq_desc for %d\n", irq); 783 printk(KERN_INFO "can not get irq_desc for %d\n", irq);
782 continue; 784 continue;
783 } 785 }
786#endif
784 787
785 intc_register_irq(desc, d, vect->enum_id, irq); 788 intc_register_irq(desc, d, vect->enum_id, irq);
786 } 789 }