]> err.no Git - linux-2.6/commit
PCI: don't load acpi_php when acpi is disabled
authorYinghai Lu <Yinghai.Lu@Sun.COM>
Tue, 5 Feb 2008 08:01:48 +0000 (00:01 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 21 Feb 2008 23:34:37 +0000 (15:34 -0800)
commit6e4be1ff2e767fc3a34c5e8d67c3cba107c02099
tree130e3072bae0b579b0afd4f370cc605a2001fafb
parent9dc625e72309e1c919ea3e7f51d0ffca96123787
PCI: don't load acpi_php when acpi is disabled

When acpi=off and pci=nomsi, don't load acpiphp.

Fixes this:

pci_hotplug: PCI Hot Plug PCI Core version: 0.5
acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5
ACPI Exception (utmutex-0263): AE_BAD_PARAMETER, Thread
FFFF81103CC54000 could not acquire Mutex [1] [20070126]

[akpm@linux-foundation.org: export acpi_pci_disabled for acpiphp.ko]
[akpm@linux-foundation.org: fix return statement]
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/x86/kernel/acpi/boot.c
drivers/pci/hotplug/acpiphp_core.c