3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joe Lawrence <joe.lawrence@xxxxxxxxxxx> commit a26d5ecb3201c11e03663a8f4a7dedc0c5f85c07 upstream. Don't allocate and track PCIe ASPM state when "pcie_aspm=off" is specified on the kernel command line. Based-on-patch-from: Matthew Garrett <mjg59@xxxxxxxxxxxxx> Signed-off-by: Joe Lawrence <joe.lawrence@xxxxxxxxxxx> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> Reviewed-by: David Bulkow <david.bulkow@xxxxxxxxxxx> Acked-by: Myron Stowe <myron.stowe@xxxxxxxxxx> [wyj: Backported to 3.4: context adjust] Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/pci/pcie/aspm.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -583,6 +583,9 @@ void pcie_aspm_init_link_state(struct pc struct pcie_link_state *link; int blacklist = !!pcie_aspm_sanity_check(pdev); + if (!aspm_support_enabled) + return; + if (!pci_is_pcie(pdev) || pdev->link_state) return; if (pdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT && -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html