Commit 8e498582 authored by Andy Grover's avatar Andy Grover

ACPI: Do not reinit ACPI irq entry in ioapic (thanks to Stian Jordet)

parent 2fdc26e5
...@@ -1086,7 +1086,7 @@ void __init mp_parse_prt (void) ...@@ -1086,7 +1086,7 @@ void __init mp_parse_prt (void)
/* /*
* Parsing through the PCI Interrupt Routing Table (PRT) and program * Parsing through the PCI Interrupt Routing Table (PRT) and program
* routing for all static (IOAPIC-direct) entries. * routing for all entries.
*/ */
list_for_each(node, &acpi_prt.entries) { list_for_each(node, &acpi_prt.entries) {
entry = list_entry(node, struct acpi_prt_entry, node); entry = list_entry(node, struct acpi_prt_entry, node);
...@@ -1100,6 +1100,10 @@ void __init mp_parse_prt (void) ...@@ -1100,6 +1100,10 @@ void __init mp_parse_prt (void)
else else
irq = entry->link.index; irq = entry->link.index;
/* Don't set up the ACPI SCI because it's already set up */
if (acpi_fadt.sci_int == irq)
continue;
ioapic = mp_find_ioapic(irq); ioapic = mp_find_ioapic(irq);
if (ioapic < 0) if (ioapic < 0)
continue; continue;
......
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