The patch titled
pci: don't load acpi_php when acpi is disabled
has been added to the -mm tree. Its filename is
pci-dont-load-acpi_php-when-acpi-is-disabled.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pci: don't load acpi_php when acpi is disabled
From: Yinghai Lu <Yinghai.Lu@xxxxxxx>
When acpi=off and pci=nomsi, don't load acpiphp
Signed-off-by: Yinghai Lu <yinghai.lu@xxxxxxx>
Cc: Kristen Carlson Accardi <kristen.c.accardi@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pci/hotplug/acpiphp_core.c | 6 ++++++
1 file changed, 6 insertions(+)
diff -puN drivers/pci/hotplug/acpiphp_core.c~pci-dont-load-acpi_php-when-acpi-is-disabled drivers/pci/hotplug/acpiphp_core.c
--- a/drivers/pci/hotplug/acpiphp_core.c~pci-dont-load-acpi_php-when-acpi-is-disabled
+++ a/drivers/pci/hotplug/acpiphp_core.c
@@ -392,6 +392,9 @@ static int __init acpiphp_init(void)
{
info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
+ if (acpi_pci_disabled)
+ return 0;
+
acpiphp_debug = debug;
/* read all the ACPI info from the system */
@@ -401,6 +404,9 @@ static int __init acpiphp_init(void)
static void __exit acpiphp_exit(void)
{
+ if (acpi_pci_disabled)
+ return 0;
+
/* deallocate internal data structures etc. */
acpiphp_glue_exit();
}
_
Patches currently in -mm which might be from Yinghai.Lu@xxxxxxx are
git-cpufreq.patch
serial-keep-the-dtr-setting-for-serial-console.patch
git-x86.patch
kernel-printkc-concerns-about-the-console-handover.patch
pcie-aer-dont-check-_osc-when-acpi-is-disabled.patch
pci-dont-load-acpi_php-when-acpi-is-disabled.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
