summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2004-11-18 23:20:50 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-18 23:20:50 -0800
commit68107b27b2d51f8aa4acc44728e1f96caa520c2e (patch)
tree730d06f2eaf8ec9e2379ac1ac252e3de7c2a735e /include
parent3daa0dc842d435ca2ef7dca4454118798fd68e3d (diff)
[PATCH] x86_64: fix interrupt routing with nosmp
Fix interaction between nosmp and pcibios_fixup_irqs(). Originally from Oleg Nesterov via i386 When we boot with nosmp we dont have all the mptable info, so IO_APIC_get_PCI_irq_vector() doesnt work and devices just end up getting a wrong interrupt. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86_64/io_apic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h
index 288296121af1..7efc932e8f0b 100644
--- a/include/asm-x86_64/io_apic.h
+++ b/include/asm-x86_64/io_apic.h
@@ -199,7 +199,7 @@ extern int skip_ioapic_setup;
* If we use the IO-APIC for IRQ routing, disable automatic
* assignment of PCI IRQ's.
*/
-#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup)
+#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs)
#ifdef CONFIG_ACPI_BOOT
extern int io_apic_get_unique_id (int ioapic, int apic_id);