patch-2.4.27 linux-2.4.27/arch/x86_64/kernel/i8259.c

Next file: linux-2.4.27/arch/x86_64/kernel/io_apic.c
Previous file: linux-2.4.27/arch/x86_64/kernel/e820.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.26/arch/x86_64/kernel/i8259.c linux-2.4.27/arch/x86_64/kernel/i8259.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
 
+#include <asm/acpi.h>
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -439,6 +440,7 @@
 #endif
 
 #ifndef CONFIG_VISWS
-	setup_irq(2, &irq2);
+	if (!acpi_ioapic)
+		setup_irq(2, &irq2);
 #endif
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)