Commit bc54efae authored by Len Brown's avatar Len Brown

[ACPI] print_IO_APIC() only after it is programmed

http://bugzilla.kernel.org/show_bug.cgi?id=1177
parent f7991d03
...@@ -1087,8 +1087,6 @@ static void __init setup_ioapic_ids_from_mpc (void) ...@@ -1087,8 +1087,6 @@ static void __init setup_ioapic_ids_from_mpc (void)
unsigned char old_id; unsigned char old_id;
unsigned long flags; unsigned long flags;
if (acpi_ioapic) return; /* ACPI does that already */
/* /*
* Set the IOAPIC ID to the value stored in the MPC table. * Set the IOAPIC ID to the value stored in the MPC table.
*/ */
...@@ -1673,12 +1671,14 @@ void __init setup_IO_APIC(void) ...@@ -1673,12 +1671,14 @@ void __init setup_IO_APIC(void)
/* /*
* Set up the IO-APIC IRQ routing table. * Set up the IO-APIC IRQ routing table.
*/ */
setup_ioapic_ids_from_mpc(); if (!acpi_ioapic)
setup_ioapic_ids_from_mpc();
sync_Arb_IDs(); sync_Arb_IDs();
setup_IO_APIC_irqs(); setup_IO_APIC_irqs();
init_IO_APIC_traps(); init_IO_APIC_traps();
check_timer(); check_timer();
print_IO_APIC(); if (!acpi_ioapic)
print_IO_APIC();
} }
/* Ensure the ACPI SCI interrupt level is active low, edge-triggered */ /* Ensure the ACPI SCI interrupt level is active low, edge-triggered */
......
...@@ -950,6 +950,8 @@ void __init mp_parse_prt (void) ...@@ -950,6 +950,8 @@ void __init mp_parse_prt (void)
entry->irq); entry->irq);
} }
print_IO_APIC();
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment