---

yaml --- r: 145645 b: refs/heads/master c: 4c6f18f h: refs/heads/master i: 145643: a62a98f v: v3
git-mirror · May 19, 2009 · 1320ffa · 1320ffa
1 parent e31a0a3
commit 1320ffa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1bdb523880c7f6990e9e8e50b0fc972ca475e84
+refs/heads/master: 4c6f18fc81565967da20f2d4a3922cdba33f8e2b
diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -1537,7 +1537,10 @@ static void __init setup_IO_APIC_irqs(void)
 		}
 		cfg = desc->chip_data;
 		add_pin_to_irq_node(cfg, node, apic_id, pin);
-		set_bit(pin, mp_ioapic_routing[apic_id].pin_programmed);
+		/*
+		 * don't mark it in pin_programmed, so later acpi could
+		 * set it correctly when irq < 16
+		 */
 		setup_IO_APIC_irq(apic_id, pin, irq, desc,
 				irq_trigger(idx), irq_polarity(idx));
 	}