1 files changed, 3 insertions, 9 deletions

diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
index 7f50156542fb..1e6cff5814fa 100644
--- a/arch/x86/kernel/irqinit.c
+++ b/arch/x86/kernel/irqinit.c
@@ -78,7 +78,7 @@ void __init init_ISA_irqs(void)
 #endif
         legacy_pic->init(0);
 
-        for (i = 0; i < legacy_pic->nr_legacy_irqs; i++)
+        for (i = 0; i < nr_legacy_irqs(); i++)
                 irq_set_chip_and_handler_name(i, chip, handle_level_irq, name);
 }
 
@@ -87,12 +87,6 @@ void __init init_IRQ(void)
         int i;
 
         /*
-         * We probably need a better place for this, but it works for
-         * now ...
-         */
-        x86_add_irq_domains();
-
-        /*
          * On cpu 0, Assign IRQ0_VECTOR..IRQ15_VECTOR's to IRQ 0..15.
          * If these IRQ's are handled by legacy interrupt-controllers like PIC,
          * then this configuration will likely be static after the boot. If
@@ -100,7 +94,7 @@ void __init init_IRQ(void)
          * then this vector space can be freed and re-used dynamically as the
          * irq's migrate etc.
          */
-        for (i = 0; i < legacy_pic->nr_legacy_irqs; i++)
+        for (i = 0; i < nr_legacy_irqs(); i++)
                 per_cpu(vector_irq, 0)[IRQ0_VECTOR + i] = i;
 
         x86_init.irqs.intr_init();
@@ -121,7 +115,7 @@ void setup_vector_irq(int cpu)
          * legacy PIC, for the new cpu that is coming online, setup the static
          * legacy vector to irq mapping:
          */
-        for (irq = 0; irq < legacy_pic->nr_legacy_irqs; irq++)
+        for (irq = 0; irq < nr_legacy_irqs(); irq++)
                 per_cpu(vector_irq, cpu)[IRQ0_VECTOR + irq] = irq;
 #endif