Merge branch 'x86/crashdump' into cpus4096

[safe/jmp/linux-2.6] / arch / x86 / kernel / irqinit_32.c

diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c
index 9092103..6a92f47 100644 (file)
--- a/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
@@ -68,9 +68,8 @@ void __init init_ISA_irqs (void)
        /*
         * 16 old-style INTA-cycle interrupts:
         */
-       for (i = 0; i < 16; i++) {
-               /* first time call this irq_desc */
-               struct irq_desc *desc = irq_to_desc_alloc(i);
+       for (i = 0; i < NR_IRQS_LEGACY; i++) {
+               struct irq_desc *desc = irq_to_desc(i);
 
                desc->status = IRQ_DISABLED;
                desc->action = NULL;
@@ -184,4 +183,3 @@ void __init native_init_IRQ(void)
 
        irq_ctx_init(smp_processor_id());
 }
-