Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6616dbdf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

x86/PCI: Use x86_pci_root_bus_node() instead of get_mp_bus_to_node() 



This replaces all uses of get_mp_bus_to_node() with x86_pci_root_bus_node().

I think these uses are all on root buses, except possibly for blind
probing, where NUMA node information is unimportant.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent afcf21c2

arch/x86/pci/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
		set_mp_bus_to_node(busnum, node);

	else

#endif

		node = get_mp_bus_to_node(busnum);

		node = x86_pci_root_bus_node(busnum);



	if (node != -1 && !node_online(node))

		node = -1;

arch/x86/pci/common.c

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ void pcibios_scan_root(int busnum) 
		printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busnum);

		return;

	}

	sd->node = get_mp_bus_to_node(busnum);

	sd->node = x86_pci_root_bus_node(busnum);

	x86_pci_root_bus_resources(busnum, &resources);

	printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum);

	bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, sd, &resources);