patch-2.4.23 linux-2.4.23/arch/x86_64/kernel/pci-pc.c

• Lines: 26
• Date: 2003-11-28 10:26:19.000000000 -0800
• Orig file: linux-2.4.22/arch/x86_64/kernel/pci-pc.c
• Orig date: 2003-08-25 04:44:40.000000000 -0700

diff -urN linux-2.4.22/arch/x86_64/kernel/pci-pc.c linux-2.4.23/arch/x86_64/kernel/pci-pc.c
@@ -23,6 +23,7 @@
 #include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/mpspec.h>
+#include <asm/proto.h>
 
 #include "pci-x86_64.h"
 
@@ -588,7 +589,7 @@
 
 	printk(KERN_INFO "PCI: Probing PCI hardware\n");
 #ifdef CONFIG_ACPI_PCI
- 	if (!acpi_pci_irq_init())
+ 	if (!acpi_disabled && !acpi_noirq && !acpi_pci_irq_init())
  		pci_using_acpi_prt = 1;
 #endif
  	if (!pci_using_acpi_prt) {
@@ -661,7 +662,7 @@
 		return err;
 
 #ifdef CONFIG_ACPI_PCI
-	if (pci_using_acpi_prt) {
+	if (!acpi_noirq && pci_using_acpi_prt) {
 		acpi_pci_irq_enable(dev);
 		return 0;
 	}