[ACPI] Re: ACPI kernel panic at boot on 2.6.0-test5-mm1

[Andi K. <ak...@su...>]

David Mansfield <lk...@dm...> writes:

> at acpi_pci_link_calc_penalties

Try this (untested) patch

(2.6 version untested, I tested a similar patch on the 2.4 backport of
ACPI):

--- linux-2.6.0test5-work/arch/i386/pci/acpi.c-o	2003-08-23 13:03:09.000000000 +0200
+++ linux-2.6.0test5-work/arch/i386/pci/acpi.c	2003-09-09 21:01:49.000000000 +0200
@@ -15,10 +15,11 @@
 
 static int __init pci_acpi_init(void)
 {
+	extern int acpi_disabled;
 	if (pcibios_scanned)
 		return 0;
 
-	if (!(pci_probe & PCI_NO_ACPI_ROUTING)) {
+	if (!(pci_probe & PCI_NO_ACPI_ROUTING) && !acpi_disabled) {
 		if (!acpi_pci_irq_init()) {
 			printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
 			printk(KERN_INFO "PCI: if you experience problems, try using option 'pci=noacpi' or even 'acpi=off'\n");


-Andi