Skip to content

Commit

Permalink
Merge tag 'pci-v4.20-fixes-1' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "Revert a _PXM change that causes silent early boot failure on some AMD
  ThreadRipper systems"

* tag 'pci-v4.20-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  Revert "ACPI/PCI: Pay attention to device-specific _PXM node values"
  • Loading branch information
Linus Torvalds committed Nov 14, 2018
2 parents dbcec2e + 0d76bcc commit d41217a
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions drivers/pci/pci-acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -793,15 +793,10 @@ static void pci_acpi_setup(struct device *dev)
{
struct pci_dev *pci_dev = to_pci_dev(dev);
struct acpi_device *adev = ACPI_COMPANION(dev);
int node;

if (!adev)
return;

node = acpi_get_node(adev->handle);
if (node != NUMA_NO_NODE)
set_dev_node(dev, node);

pci_acpi_optimize_delay(pci_dev, adev->handle);

pci_acpi_add_pm_notifier(adev, pci_dev);
Expand Down

0 comments on commit d41217a

Please sign in to comment.