Commit 5e562ca4 authored by Len Brown's avatar Len Brown Committed by Len Brown

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

http://bugzilla.kernel.org/show_bug.cgi?id=1177
parent bae885e8
...@@ -1624,10 +1624,6 @@ static void __init setup_ioapic_ids_from_mpc(void) ...@@ -1624,10 +1624,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)
/* This gets done during IOAPIC enumeration for ACPI. */
return;
/* /*
* This is broken; anything with a real cpu count has to * This is broken; anything with a real cpu count has to
* circumvent this idiocy regardless. * circumvent this idiocy regardless.
...@@ -2217,12 +2213,14 @@ void __init setup_IO_APIC(void) ...@@ -2217,12 +2213,14 @@ void __init setup_IO_APIC(void)
/* /*
* Set up IO-APIC IRQ routing. * Set up IO-APIC IRQ routing.
*/ */
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();
} }
/* /*
......
...@@ -1165,6 +1165,10 @@ void __init mp_parse_prt (void) ...@@ -1165,6 +1165,10 @@ void __init mp_parse_prt (void)
mp_ioapic_routing[ioapic].apic_id, ioapic_pin, mp_ioapic_routing[ioapic].apic_id, ioapic_pin,
entry->irq); entry->irq);
} }
print_IO_APIC();
return;
} }
#endif /*CONFIG_ACPI_PCI*/ #endif /*CONFIG_ACPI_PCI*/
......
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