Commit 98469742 authored by Len Brown's avatar Len Brown

[ACPI] fix double timer interrupt mapping (Hans-Frieder Vogt)

caused by errant fix for OSDL 2835
parent 4575a346
...@@ -1002,7 +1002,7 @@ void __init mp_config_acpi_legacy_irqs (void) ...@@ -1002,7 +1002,7 @@ void __init mp_config_acpi_legacy_irqs (void)
for (idx = 0; idx < mp_irq_entries; idx++) for (idx = 0; idx < mp_irq_entries; idx++)
if (mp_irqs[idx].mpc_srcbus == MP_ISA_BUS && if (mp_irqs[idx].mpc_srcbus == MP_ISA_BUS &&
(mp_irqs[idx].mpc_dstapic == ioapic) && (mp_irqs[idx].mpc_dstapic == intsrc.mpc_dstapic) &&
(mp_irqs[idx].mpc_srcbusirq == i || (mp_irqs[idx].mpc_srcbusirq == i ||
mp_irqs[idx].mpc_dstirq == i)) mp_irqs[idx].mpc_dstirq == i))
break; break;
......
...@@ -861,7 +861,7 @@ void __init mp_config_acpi_legacy_irqs (void) ...@@ -861,7 +861,7 @@ void __init mp_config_acpi_legacy_irqs (void)
for (idx = 0; idx < mp_irq_entries; idx++) for (idx = 0; idx < mp_irq_entries; idx++)
if (mp_irqs[idx].mpc_srcbus == MP_ISA_BUS && if (mp_irqs[idx].mpc_srcbus == MP_ISA_BUS &&
(mp_irqs[idx].mpc_dstapic == ioapic) && (mp_irqs[idx].mpc_dstapic == intsrc.mpc_dstapic) &&
(mp_irqs[idx].mpc_srcbusirq == i || (mp_irqs[idx].mpc_srcbusirq == i ||
mp_irqs[idx].mpc_dstirq == i)) mp_irqs[idx].mpc_dstirq == i))
break; break;
......
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