[ACPI] In ACPI mode, delay print_IO_APIC() to make its output valid.

http://bugzilla.kernel.org/show_bug.cgi?id=1177

diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 2907f82f69887bcc869ec18e19b4d7d33f11f1dd..a1e23b1a27e8c045a9f713848f6a8498ef9e1db4 100644 (file)
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -1624,10 +1624,6 @@ static void __init setup_ioapic_ids_from_mpc(void)
        unsigned char old_id;
        unsigned long flags;
 
-       if (acpi_ioapic)
-               /* This gets done during IOAPIC enumeration for ACPI. */
-               return;
-
        /*
         * This is broken; anything with a real cpu count has to
         * circumvent this idiocy regardless.
@@ -2217,12 +2213,14 @@ void __init setup_IO_APIC(void)
        /*
         * Set up IO-APIC IRQ routing.
         */
-       setup_ioapic_ids_from_mpc();
+       if (!acpi_ioapic)
+               setup_ioapic_ids_from_mpc();
        sync_Arb_IDs();
        setup_IO_APIC_irqs();
        init_IO_APIC_traps();
        check_timer();
-       print_IO_APIC();
+       if (!acpi_ioapic)
+               print_IO_APIC();
 }
 
 /*

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index ac55df3baae0d93b79281206c9dea6142b2d2a3d..798632516a4b941b3318fc675dcce65b55c2da29 100644 (file)
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -1165,6 +1165,10 @@ void __init mp_parse_prt (void)
                        mp_ioapic_routing[ioapic].apic_id, ioapic_pin, 
                        entry->irq);
        }
+
+       print_IO_APIC();
+
+       return;
 }
 
 #endif /*CONFIG_ACPI_PCI*/