The patch titled
pcie AER: don't check _OSC when acpi is disabled
has been added to the -mm tree. Its filename is
pcie-aer-dont-check-_osc-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: pcie AER: don't check _OSC when acpi is disabled
From: Yinghai Lu <Yinghai.Lu@xxxxxxx>
When acpi=off and pci=nomsi, don't check _OSC in aer_osc_setup
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/pcie/aer/aerdrv_acpi.c | 3 +++
1 file changed, 3 insertions(+)
diff -puN drivers/pci/pcie/aer/aerdrv_acpi.c~pcie-aer-dont-check-_osc-when-acpi-is-disabled drivers/pci/pcie/aer/aerdrv_acpi.c
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c~pcie-aer-dont-check-_osc-when-acpi-is-disabled
+++ a/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -34,6 +34,9 @@ int aer_osc_setup(struct pcie_device *pc
acpi_handle handle = DEVICE_ACPI_HANDLE(&pdev->dev);
struct pci_bus *parent;
+ if (acpi_pci_disabled)
+ return -1;
+
while (!handle) {
if (!pdev || !pdev->bus->parent)
break;
_
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
