Re: [PATCH] acpi-20030916-2.6.0-pre5.diff

Andrew Morton
2003-09-18T22:54:21Z

Len Brown <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> wrote:
>
> This patch updates 2.6.0-test5 to the current ACPI in 2.4.22-pre5
> If nothing explodes, I'll be releasing it to Linus shortly via BK.

And it doesn't include this fix

From: Andi Kleen <ak-l3A5Bk7waGM@public.gmane.org>

Try this (untested) patch

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

25-akpm/arch/i386/pci/acpi.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN arch/i386/pci/acpi.c~acpi_off-fix arch/i386/pci/acpi.c
--- 25/arch/i386/pci/acpi.c~acpi_off-fix Tue Sep 9 12:12:00 2003
+++ 25-akpm/arch/i386/pci/acpi.c Tue Sep 9 12:12:00 2003
@@ -15,10 +15,11 @@ struct pci_bus * __devinit pci_acpi_scan

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");

_