From: Yinghai Lu <Yinghai.Lu@Sun.COM>

When acpi=off and pci=nomsi, don't check _OSC in aer_osc_setup

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Cc: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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;
_