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

• Lines: 17
• Date: 2004-08-07 16:26:04.631345832 -0700
• Orig file: linux-2.4.26/arch/x86_64/kernel/i8259.c
• Orig date: 2003-06-13 07:51:32.000000000 -0700

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
 }