aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/handle.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r--kernel/irq/handle.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index f01c0a30cb42..790c5fa7ea39 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -132,6 +132,8 @@ int __init early_irq_init(void)
132 int legacy_count; 132 int legacy_count;
133 int i; 133 int i;
134 134
135 printk(KERN_INFO "NR_IRQS:%d nr_irqs:%d\n", NR_IRQS, nr_irqs);
136
135 desc = irq_desc_legacy; 137 desc = irq_desc_legacy;
136 legacy_count = ARRAY_SIZE(irq_desc_legacy); 138 legacy_count = ARRAY_SIZE(irq_desc_legacy);
137 139
@@ -143,7 +145,7 @@ int __init early_irq_init(void)
143 irq_desc_ptrs[i] = desc + i; 145 irq_desc_ptrs[i] = desc + i;
144 } 146 }
145 147
146 for (i = legacy_count; i < NR_IRQS; i++) 148 for (i = legacy_count; i < nr_irqs; i++)
147 irq_desc_ptrs[i] = NULL; 149 irq_desc_ptrs[i] = NULL;
148 150
149 return arch_early_irq_init(); 151 return arch_early_irq_init();
@@ -151,7 +153,7 @@ int __init early_irq_init(void)
151 153
152struct irq_desc *irq_to_desc(unsigned int irq) 154struct irq_desc *irq_to_desc(unsigned int irq)
153{ 155{
154 return (irq < NR_IRQS) ? irq_desc_ptrs[irq] : NULL; 156 return (irq < nr_irqs) ? irq_desc_ptrs[irq] : NULL;
155} 157}
156 158
157struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu) 159struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu)
@@ -160,9 +162,9 @@ struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu)
160 unsigned long flags; 162 unsigned long flags;
161 int node; 163 int node;
162 164
163 if (irq >= NR_IRQS) { 165 if (irq >= nr_irqs) {
164 printk(KERN_WARNING "irq >= NR_IRQS in irq_to_desc_alloc: %d %d\n", 166 printk(KERN_WARNING "irq >= nr_irqs in irq_to_desc_alloc: %d %d\n",
165 irq, NR_IRQS); 167 irq, nr_irqs);
166 WARN_ON(1); 168 WARN_ON(1);
167 return NULL; 169 return NULL;
168 } 170 }
@@ -214,6 +216,8 @@ int __init early_irq_init(void)
214 int count; 216 int count;
215 int i; 217 int i;
216 218
219 printk(KERN_INFO "NR_IRQS:%d\n", NR_IRQS);
220
217 desc = irq_desc; 221 desc = irq_desc;
218 count = ARRAY_SIZE(irq_desc); 222 count = ARRAY_SIZE(irq_desc);
219 223