[ACPI] print_IO_APIC() only after it is programmed

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

diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index 1148ddec35a3e904cc7221e85b3510e56928ff17..3f86abd9c91d13ce25f97d6e7e97b1e73f64aefc 100644 (file)
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -1087,8 +1087,6 @@ static void __init setup_ioapic_ids_from_mpc (void)
        unsigned char old_id;
        unsigned long flags;
 
-       if (acpi_ioapic) return; /* ACPI does that already */
-
        /*
         * Set the IOAPIC ID to the value stored in the MPC table.
         */
@@ -1673,12 +1671,14 @@ void __init setup_IO_APIC(void)
        /*
         * Set up the IO-APIC IRQ routing table.
         */
-       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();
 }
 
 /* Ensure the ACPI SCI interrupt level is active low, edge-triggered */

diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 17ac22cee2ee3807801eac0802161782576704ec..7dd6260531f357f8edbd84ebbe6b6503f1ee8cc2 100644 (file)
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -950,6 +950,8 @@ void __init mp_parse_prt (void)
                        entry->irq);
        }
        
+       print_IO_APIC();
+
        return;
 }